修改安卓导出语言包按时间顺序排序

controller/LangArea.py

@@ -120,19 +120,30 @@ class LangAreaView(TemplateView):
         en_kv = {}
         for e in en_qs:
             en_kv[e['word_key']] = e['langvalmodel__word_val']
-        res_qs = LangKeyModel.objects.filter(langvalmodel__la__id=id).values('word_key', 'langvalmodel__word_val')
-        res = {}
-        for r in res_qs:
-            print(r['langvalmodel__word_val'])
-            if r['langvalmodel__word_val']:
-                res[r['word_key']] = r['langvalmodel__word_val']
-            elif en_kv[r['word_key']]:
-                res[r['word_key']] = en_kv[r['word_key']]
+
         content = ''
         if type == 'ios':
+            res_qs = LangKeyModel.objects.filter(langvalmodel__la__id=id).\
+                values('word_key', 'langvalmodel__word_val')
+            res = {}
+            for r in res_qs:
+                print(r['langvalmodel__word_val'])
+                if r['langvalmodel__word_val']:
+                    res[r['word_key']] = r['langvalmodel__word_val']
+                elif en_kv[r['word_key']]:
+                    res[r['word_key']] = en_kv[r['word_key']]
             for l in res:
                 content = content + '"' + l + '"="' + res[l] + '";\n'
         elif type == 'android':
+            res_qs = LangKeyModel.objects.filter(langvalmodel__la__id=id).\
+                values('word_key', 'langvalmodel__word_val').order_by('addTime')
+            res = {}
+            for r in res_qs:
+                print(r['langvalmodel__word_val'])
+                if r['langvalmodel__word_val']:
+                    res[r['word_key']] = r['langvalmodel__word_val']
+                elif en_kv[r['word_key']]:
+                    res[r['word_key']] = en_kv[r['word_key']]
             for l in res:
                 lk = l
                 lk = lk.replace('.', '_')