From b716ceff66aa4c1c4a116f74a9783dca2e18a570 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 21 Mar 2016 15:58:26 +0000
Subject: [PATCH] Fix translation name for simplified Chinese.

---
 platform/osx/make_dmg.sh            | 2 +-
 platform/windows/wscript            | 8 ++++----
 src/lib/po/{cn_CN.po => zh_CN.po}   | 0
 src/tools/po/{cn_CN.po => zh_CN.po} | 0
 src/wx/config_dialog.cc             | 2 +-
 src/wx/po/{cn_CN.po => zh_CN.po}    | 0
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename src/lib/po/{cn_CN.po => zh_CN.po} (100%)
 rename src/tools/po/{cn_CN.po => zh_CN.po} (100%)
 rename src/wx/po/{cn_CN.po => zh_CN.po} (100%)

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 37e9c23bf..5ebce17e1 100644
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -196,7 +196,7 @@ cp $ROOT/32/src/dcpomatic/graphics/splash.png "$WORK/$resources"
 cp $ROOT/32/src/dcpomatic/graphics/dcpomatic2_server_small.png "$WORK/$resources"
 
 # i18n: DCP-o-matic .mo files
-for lang in de_DE es_ES fr_FR it_IT sv_SE nl_NL ru_RU pl_PL da_DK pt_PT pt_BR sk_SK cs_CZ uk_UA cn_CN; do
+for lang in de_DE es_ES fr_FR it_IT sv_SE nl_NL ru_RU pl_PL da_DK pt_PT pt_BR sk_SK cs_CZ uk_UA zh_CN; do
   mkdir -p "$WORK/$resources/$lang/LC_MESSAGES"
   cp $ROOT/32/src/dcpomatic/build/src/lib/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
   cp $ROOT/32/src/dcpomatic/build/src/wx/mo/$lang/*.mo "$WORK/$resources/$lang/LC_MESSAGES"
diff --git a/platform/windows/wscript b/platform/windows/wscript
index 6f845702c..54d53eff5 100644
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -230,10 +230,10 @@ SetOutPath "$INSTDIR\\locale\\uk\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/uk_UA/libdcpomatic2.mo"
 File "%binaries%/src/wx/mo/uk_UA/libdcpomatic2-wx.mo"
 File "%binaries%/src/tools/mo/uk_UA/dcpomatic2.mo"
-SetOutPath "$INSTDIR\\locale\\cn\\LC_MESSAGES"
-File "%binaries%/src/lib/mo/cn_CN/libdcpomatic2.mo"
-File "%binaries%/src/wx/mo/cn_CN/libdcpomatic2-wx.mo"
-File "%binaries%/src/tools/mo/cn_CN/dcpomatic2.mo"
+SetOutPath "$INSTDIR\\locale\\zh_cn\\LC_MESSAGES"
+File "%binaries%/src/lib/mo/zh_CN/libdcpomatic2.mo"
+File "%binaries%/src/wx/mo/zh_CN/libdcpomatic2-wx.mo"
+File "%binaries%/src/tools/mo/zh_CN/dcpomatic2.mo"
 
 SetOutPath "$INSTDIR"
 File "%resources%/../../fonts/LiberationSans-Regular.ttf"
diff --git a/src/lib/po/cn_CN.po b/src/lib/po/zh_CN.po
similarity index 100%
rename from src/lib/po/cn_CN.po
rename to src/lib/po/zh_CN.po
diff --git a/src/tools/po/cn_CN.po b/src/tools/po/zh_CN.po
similarity index 100%
rename from src/tools/po/cn_CN.po
rename to src/tools/po/zh_CN.po
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 5f8679f0f..eb3736c6c 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -162,7 +162,7 @@ private:
 		_language = new wxChoice (_panel, wxID_ANY);
 		vector<pair<string, string> > languages;
 		languages.push_back (make_pair ("Čeština", "cs_CZ"));
-		languages.push_back (make_pair ("汉语/漢語", "cn_CN"));
+		languages.push_back (make_pair ("汉语/漢語", "zh_CN"));
 		languages.push_back (make_pair ("Dansk", "da_DK"));
 		languages.push_back (make_pair ("Deutsch", "de_DE"));
 		languages.push_back (make_pair ("English", "en_GB"));
diff --git a/src/wx/po/cn_CN.po b/src/wx/po/zh_CN.po
similarity index 100%
rename from src/wx/po/cn_CN.po
rename to src/wx/po/zh_CN.po
-- 
2.30.2