Merge pull request #3376 from torfsen/fix-random-translation-files-order

Fix random order of translation files
ckan · Jan 3, 2017 · 286a4ac · 286a4ac
2 parents 2c5477c + a60f026
commit 286a4ac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ckan/lib/i18n.py b/ckan/lib/i18n.py
@@ -36,6 +36,7 @@
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 '''
 
+import collections
 import json
 import logging
 import os
@@ -362,7 +363,7 @@ def build_js_translations():
     # Collect all language codes (an extension might add support for a
     # language that isn't supported by CKAN core, yet).
     langs = set()
-    i18n_dirs = {ckan_i18n_dir: u'ckan'}
+    i18n_dirs = collections.OrderedDict([(ckan_i18n_dir, u'ckan')])
     for item in os.listdir(ckan_i18n_dir):
         if os.path.isdir(os.path.join(ckan_i18n_dir, item)):
             langs.add(item)

diff --git a/ckan/tests/lib/_i18n_build_js_translations/de/LC_MESSAGES/ckanext-test_js_translations.po b/ckan/tests/lib/_i18n_build_js_translations/de/LC_MESSAGES/ckanext-test_js_translations.po
@@ -12,6 +12,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.1.1\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 # Overriding a JS translation from CKAN core
 msgid "Loading..."