[fix] language for zh and zh-TW (#2052)

frappe/core/doctype/language/language.py

@@ -31,3 +31,11 @@ def sync_languages():
 				'language_code': l['code'],
 				'language_name': l['name']
 			}).insert()
+
+def update_language_names():
+	'''Update frappe/geo/languages.json names (for use via patch)'''
+	with open(frappe.get_app_path('frappe', 'geo', 'languages.json'), 'r') as f:
+		data = json.loads(f.read())
+
+	for l in data:
+		frappe.db.set_value('Language', l['code'], 'language_name', l['name'])

frappe/geo/languages.json

@@ -1,290 +1,290 @@
 [
  {
-  "code": "am",
+  "code": "am", 
   "name": "\u12a0\u121b\u122d\u129b"
- },
+ }, 
  {
-  "code": "ar",
+  "code": "ar", 
   "name": "\u0627\u0644\u0639\u0631\u0628\u064a\u0629"
- },
+ }, 
  {
-  "code": "bg",
+  "code": "bg", 
   "name": "b\u01celgarski"
- },
+ }, 
  {
-  "code": "bn",
+  "code": "bn", 
   "name": "\u09ac\u09be\u0999\u09be\u09b2\u09bf"
- },
+ }, 
  {
-  "code": "bo",
+  "code": "bo", 
   "name": "\u0f63\u0fb7\u0f0b\u0f66\u0f60\u0f72\u0f0b\u0f66\u0f90\u0f51\u0f0b"
- },
+ }, 
  {
-  "code": "bs",
+  "code": "bs", 
   "name": "bosanski"
- },
+ }, 
  {
-  "code": "ca",
+  "code": "ca", 
   "name": "catal\u00e0"
- },
+ }, 
  {
-  "code": "cs",
+  "code": "cs", 
   "name": "\u010desky"
- },
+ }, 
  {
-  "code": "da",
+  "code": "da", 
   "name": "dansk"
- },
+ }, 
  {
-  "code": "da-DK",
+  "code": "da-DK", 
   "name": "Dansk (Danmark)"
- },
+ }, 
  {
-  "code": "de",
+  "code": "de", 
   "name": "deutsch"
- },
+ }, 
  {
-  "code": "el",
+  "code": "el", 
   "name": "\u03b5\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac"
- },
+ }, 
  {
-  "code": "en",
+  "code": "en", 
   "name": "english"
- },
+ }, 
  {
-  "code": "en-US",
+  "code": "en-US", 
   "name": "English (United States)"
- },
+ }, 
  {
-  "code": "es",
+  "code": "es", 
   "name": "espa\u00f1ol"
- },
+ }, 
  {
-  "code": "es-AR",
+  "code": "es-AR", 
   "name": "Espa\u00f1ol (Argentina)"
- },
+ }, 
  {
-  "code": "es-CL",
+  "code": "es-CL", 
   "name": "Espa\u00f1ol (Chile)"
- },
+ }, 
  {
-  "code": "es-GT",
+  "code": "es-GT", 
   "name": "Espa\u00f1ol (Guatemala)"
- },
+ }, 
  {
-  "code": "es-MX",
+  "code": "es-MX", 
   "name": "Espa\u00f1ol (M\u00e9xico)"
- },
+ }, 
  {
-  "code": "es-NI",
+  "code": "es-NI", 
   "name": "Espa\u00f1ol (Nicaragua)"
- },
+ }, 
  {
-  "code": "es-PE",
+  "code": "es-PE", 
   "name": "Espa\u00f1ol (Per\u00fa)"
- },
+ }, 
  {
-  "code": "et",
+  "code": "et", 
   "name": "eesti"
- },
+ }, 
  {
-  "code": "fa",
+  "code": "fa", 
   "name": "\u067e\u0627\u0631\u0633\u06cc"
- },
+ }, 
  {
-  "code": "fi",
+  "code": "fi", 
   "name": "suomalainen"
- },
+ }, 
  {
-  "code": "fr",
+  "code": "fr", 
   "name": "fran\u00e7ais"
- },
+ }, 
  {
-  "code": "fr-CA",
+  "code": "fr-CA", 
   "name": "fran\u00e7ais canadien"
- },
+ }, 
  {
-  "code": "gu",
+  "code": "gu", 
   "name": "\u0a97\u0ac1\u0a9c\u0ab0\u0abe\u0aa4\u0ac0"
- },
+ }, 
  {
-  "code": "he",
+  "code": "he", 
   "name": "\u05e2\u05d1\u05e8\u05d9\u05ea"
- },
+ }, 
  {
-  "code": "hi",
+  "code": "hi", 
   "name": "\u0939\u093f\u0902\u0926\u0940"
- },
+ }, 
  {
-  "code": "hr",
+  "code": "hr", 
   "name": "hrvatski"
- },
+ }, 
  {
-  "code": "hu",
+  "code": "hu", 
   "name": "magyar"
- },
+ }, 
  {
-  "code": "id",
+  "code": "id", 
   "name": "Indonesia"
- },
+ }, 
  {
-  "code": "is",
+  "code": "is", 
   "name": "\u00edslenska"
- },
+ }, 
  {
-  "code": "it",
+  "code": "it", 
   "name": "italiano"
- },
+ }, 
  {
-  "code": "ja",
+  "code": "ja", 
   "name": "\u65e5\u672c\u8a9e"
- },
+ }, 
  {
-  "code": "km",
+  "code": "km", 
   "name": "\u1797\u17b6\u179f\u17b6\u1781\u17d2\u1798\u17c2\u179a"
- },
+ }, 
  {
-  "code": "kn",
+  "code": "kn", 
   "name": "\u0c95\u0ca8\u0ccd\u0ca8\u0ca1"
- },
+ }, 
  {
-  "code": "ko",
+  "code": "ko", 
   "name": "\ud55c\uad6d\uc758"
- },
+ }, 
  {
-  "code": "ku",
+  "code": "ku", 
   "name": "\u06a9\u0648\u0631\u062f\u06cc"
- },
+ }, 
  {
-  "code": "lo",
+  "code": "lo", 
   "name": "\u0ea5\u0eb2\u0ea7"
- },
+ }, 
  {
-  "code": "lt",
+  "code": "lt", 
   "name": "lietuvi\u0173 kalba"
- },
+ }, 
  {
-  "code": "lv",
+  "code": "lv", 
   "name": "latvie\u0161u valoda"
- },
+ }, 
  {
-  "code": "mk",
+  "code": "mk", 
   "name": "\u043c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438"
- },
+ }, 
  {
-  "code": "ml",
+  "code": "ml", 
   "name": "\u0d2e\u0d32\u0d2f\u0d3e\u0d33\u0d02"
- },
+ }, 
  {
-  "code": "mr",
+  "code": "mr", 
   "name": "\u092e\u0930\u093e\u0920\u0940"
- },
+ }, 
  {
-  "code": "ms",
+  "code": "ms", 
   "name": "Melayu"
- },
+ }, 
  {
-  "code": "my",
+  "code": "my", 
   "name": "\u1019\u103c\u1014\u103a\u1019\u102c"
- },
+ }, 
  {
-  "code": "nl",
+  "code": "nl", 
   "name": "nederlands"
- },
+ }, 
  {
-  "code": "no",
+  "code": "no", 
   "name": "norsk"
- },
+ }, 
  {
-  "code": "pl",
+  "code": "pl", 
   "name": "polski"
- },
+ }, 
  {
-  "code": "ps",
+  "code": "ps", 
   "name": "\u067e\u069a\u062a\u0648"
- },
+ }, 
  {
-  "code": "pt",
+  "code": "pt", 
   "name": "portugu\u00eas"
- },
+ }, 
  {
-  "code": "pt-BR",
+  "code": "pt-BR", 
   "name": "portugu\u00eas brasileiro"
- },
+ }, 
  {
-  "code": "ro",
+  "code": "ro", 
   "name": "rom\u00e2n"
- },
+ }, 
  {
-  "code": "ru",
+  "code": "ru", 
   "name": "\u0440\u0443\u0441\u0441\u043a\u0438\u0439"
- },
+ }, 
  {
-  "code": "rw",
+  "code": "rw", 
   "name": "Kinyarwanda"
- },
+ }, 
  {
-  "code": "si",
+  "code": "si", 
   "name": "\u0dc3\u0dd2\u0d82\u0dc4\u0dbd"
- },
+ }, 
  {
-  "code": "sk",
+  "code": "sk", 
   "name": "sloven\u010dina (Slovak)"
- },
+ }, 
  {
-  "code": "sl",
+  "code": "sl", 
   "name": "sloven\u0161\u010dina (Slovene)"
- },
+ }, 
  {
-  "code": "sq",
+  "code": "sq", 
   "name": "shqiptar"
- },
+ }, 
  {
-  "code": "sr",
+  "code": "sr", 
   "name": "\u0441\u0440\u043f\u0441\u043a\u0438"
- },
+ }, 
  {
-  "code": "sr-SP",
+  "code": "sr-SP", 
   "name": "srpski"
- },
+ }, 
  {
-  "code": "sv",
+  "code": "sv", 
   "name": "svenska"
- },
+ }, 
  {
-  "code": "ta",
+  "code": "ta", 
   "name": "\u0ba4\u0bae\u0bbf\u0bb4\u0bcd"
- },
+ }, 
  {
-  "code": "te",
+  "code": "te", 
   "name": "\u0c24\u0c46\u0c32\u0c41\u0c17\u0c41"
- },
+ }, 
  {
-  "code": "th",
+  "code": "th", 
   "name": "\u0e44\u0e17\u0e22"
- },
+ }, 
  {
-  "code": "tr",
+  "code": "tr", 
   "name": "T\u00fcrk"
- },
+ }, 
  {
-  "code": "uk",
+  "code": "uk", 
   "name": "\u0443\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430"
- },
+ }, 
  {
-  "code": "ur",
+  "code": "ur", 
   "name": "\u0627\u0631\u062f\u0648"
- },
+ }, 
  {
-  "code": "vi",
+  "code": "vi", 
   "name": "vi\u1ec7t"
- },
+ }, 
  {
-  "code": "zh",
-  "name": "\u7c21\u9ad4\u4e2d\u6587"
- },
+  "code": "zh", 
+  "name": "\u7b80\u4f53\u4e2d\u6587"
+ }, 
  {
-  "code": "zh-TW",
-  "name": "\u6b63\u9ad4\u4e2d\u6587"
+  "code": "zh-TW", 
+  "name": "\u7e41\u9ad4\u4e2d\u6587"
  }
 ]

frappe/patches.txt

@@ -137,3 +137,4 @@ frappe.patches.v7_0.replace_upgrade_link_limit
 frappe.patches.v7_0.set_email_group
 frappe.patches.v7_1.setup_integration_services
 frappe.patches.v7_1.rename_chinese_language_codes
+execute:frappe.core.doctype.language.language.update_language_names()