[chronojump] Fixed avg on query server on english
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Fixed avg on query server on english
- Date: Sun, 6 Jun 2010 02:13:13 +0000 (UTC)
commit ef0fa5faf17fcf5c095b43e1b73e93bff532288a
Author: Xavier de Blas <xaviblas master gnome org>
Date: Sun Jun 6 10:12:32 2010 +0800
Fixed avg on query server on english
chronojump_server/bin/chronojumpServer.dll | Bin 282624 -> 283136 bytes
src/gui/queryServer.cs | 6 ++++--
src/util.cs | 14 ++++++++++++++
3 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/chronojump_server/bin/chronojumpServer.dll b/chronojump_server/bin/chronojumpServer.dll
index f8612e9..ae1ca3c 100755
Binary files a/chronojump_server/bin/chronojumpServer.dll and b/chronojump_server/bin/chronojumpServer.dll differ
diff --git a/src/gui/queryServer.cs b/src/gui/queryServer.cs
index 6f02fb3..c7775fb 100644
--- a/src/gui/queryServer.cs
+++ b/src/gui/queryServer.cs
@@ -746,8 +746,10 @@ public class QueryServerWindow
label_results_num.Text = resultFull[0];
if(resultFull[0] == "0")
label_results_avg.Text = "-";
- else
- label_results_avg.Text = Util.TrimDecimals(resultFull[1], pDN);
+ else {
+ label_results_avg.Text = Util.TrimDecimals(
+ Util.ConvertToPointIfNeeded(resultFull[1]), pDN);
+}
}
return sqlString;
diff --git a/src/util.cs b/src/util.cs
index 49afd0b..38e7ea8 100644
--- a/src/util.cs
+++ b/src/util.cs
@@ -44,6 +44,20 @@ public class Util
myStringBuilder.Replace(",", ".");
return myStringBuilder.ToString();
}
+
+ //when we do a query to the server, it returns avg as "0,54" because it's latin localized
+ //if client is on english machine, need to convert this to "0.54"
+ public static string ConvertToPointIfNeeded (string myString)
+ {
+ System.Globalization.NumberFormatInfo localeInfo = new System.Globalization.NumberFormatInfo();
+ localeInfo = System.Globalization.NumberFormatInfo.CurrentInfo;
+
+ StringBuilder myStringBuilder = new StringBuilder(myString);
+ if(localeInfo.NumberDecimalSeparator == ".") {
+ myStringBuilder.Replace(",", localeInfo.NumberDecimalSeparator);
+ }
+ return myStringBuilder.ToString();
+ }
//used for load from the database all numbers with correct decimal separator (locale defined)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]