svn commit: r736179 - in /myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs: Locale.js NumberFormat.js

[ma...@apache.org]

Author: matzew
Date: Tue Jan 20 16:53:15 2009
New Revision: 736179

URL: http://svn.apache.org/viewvc?rev=736179&view=rev
Log:
TRINIDAD-1366 - client percent convertnumber not work well in fr_fr

second part of this, applied to tmp branch

Modified:
    myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Locale.js
    myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberFormat.js

Modified: myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Locale.js
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Locale.js?rev=736179&r1=736178&r2=736179&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Locale.js (original)
+++ myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Locale.js Tue Jan 20 16:53:15 2009
@@ -396,6 +396,11 @@
   return this.getLocaleElements()["NumberElements"][3];
 }
 
+function _getPercentSuffix()
+{
+  return this.getLocaleElements()["PercentElements"][0];
+}
+
 function _getZeroDigit()
 {
   return this.getLocaleElements()["NumberElements"][4];
@@ -537,6 +542,7 @@
 LocaleSymbols.prototype.getGroupingSeparator = _getGroupingSeparator;
 LocaleSymbols.prototype.getPatternSeparator = _getPatternSeparator;
 LocaleSymbols.prototype.getPercent = _getPercent;
+LocaleSymbols.prototype.getPercentSuffix = _getPercentSuffix;
 LocaleSymbols.prototype.getZeroDigit = _getZeroDigit;
 LocaleSymbols.prototype.getDigit = _getDigit;
 LocaleSymbols.prototype.getMinusSign = _getMinusSign;

Modified: myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberFormat.js
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberFormat.js?rev=736179&r1=736178&r2=736179&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberFormat.js (original)
+++ myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberFormat.js Tue Jan 20 16:53:15 2009
@@ -387,12 +387,25 @@
 {
   number = number * 100;
   number = this.getRounded(number);
-  if(isNaN(number))
+  if (isNaN(number))
   {
     throw new TrParseException("not able to parse number");
+  } 
+  
+  // Get the percent suffix. I.e. in French the suffix is " %", not just "%". The following assumes 
+  // the percent suffix is the same when the number is positive or negative. It also assumes that 
+  // the locale indeed uses a percent suffix (and not a percent prefix); if that assumption is 
+  // wrong, we should be notified by the following exception. If any changes need to be made, you 
+  // should start by looking at _getPercentData() in:
+  // maven-i18n-plugin\src\main\java\org\apache\myfaces\trinidadbuild\plugin\i18n\uixtools\JSLocaleElementsGenerator.java
+  var suffix = getLocaleSymbols().getPercentSuffix();
+  if (!suffix || suffix == "")
+  {
+    throw new TrParseException("percent suffix undefined or empty");
   }
+  
   number = this.numberToString(number);
-  return number + '%';
+  return number + suffix;
 }
 
 /**