svn commit: r1533743 - in /ofbiz/branches/release12.04: ./ framework/common/config/CommonUiLabels.xml

Author: jleroux
Date: Sat Oct 19 12:21:31 2013
New Revision: 1533743

URL: http://svn.apache.org/r1533743
Log:
"Applied fix from trunk for revision: 1497376"
------------------------------------------------------------------------
r1497376 | jleroux | 2013-06-27 16:32:10 +0200 (jeu. 27 juin 2013) | 7 lignes

A slightly enhanced path from Leon for "in zh locale, state does not change to "No States/Provinces exist" if select a country without any state defined" https://issues.apache.org/jira/browse/OFBIZ-5246

With "zh" (chinese) locale, coutry-state associated list, if you choose a country there's no any associated state defined in system, the state filed does not change.
cause: incorrect translate of "CommonNoStatesProvinces" for "zh" locale. In that, it use full-width colon ":" instead of half one plus blank space(": ").
why half-width and blank space (": ")? see code in "getDependentDropdownValues" function:

jleroux; I added a comment to prevent such cases in future
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/framework/common/config/CommonUiLabels.xml

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1497376

Modified: ofbiz/branches/release12.04/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/common/config/CommonUiLabels.xml?rev=1533743&r1=1533742&r2=1533743&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/branches/release12.04/framework/common/config/CommonUiLabels.xml Sat Oct 19 12:21:31 2013
@@ -5894,11 +5894,16 @@
         <value xml:lang="zh_TW">沒有找到記錄</value>
     </property>
     <property key="CommonNoStatesProvinces">
+        <!-- OFBIZ-5246 please use ": _NA_" at end, with a space between the colon and _NA_. getDependentDropdownValues relies on it  -->
         <value xml:lang="de">Kein exitierendes Bundesland: _NA_</value>
         <value xml:lang="en">No States/Provinces exist: _NA_</value>
         <value xml:lang="es">No existen provincias: _NA_</value>
         <value xml:lang="fr">Aucun état ou province: _NA_</value>
-        <value xml:lang="pt_BR">Nenhum estados/municípios existem: _NA_</value>
+        <value xml:lang="ja">都道府県/州/地方が存在しません: _適用外_</value>
+        <value xml:lang="pt-BR">Nenhum estados/municípios existem: _NA_</value>
+        <value xml:lang="ru">Не сущестивует ни штата, ни провинции: _NA_</value>
+        <value xml:lang="vi">Không Tỉnh/Thành nào tồn tại : _NA</value>
+        <value xml:lang="zh">没有省： _NA_</value>
     </property>
     <property key="CommonNoStatesProvincesExists">
         <value xml:lang="de">Es existiert kein Bundesland</value>