言語設定から Simplified Chinese の選択肢を削除

diff --git a/OpenTween.Tests/MyApplicationTest.cs b/OpenTween.Tests/MyApplicationTest.cs
index 1b5bcde..7457f52 100644 (file)
--- a/OpenTween.Tests/MyApplicationTest.cs
+++ b/OpenTween.Tests/MyApplicationTest.cs
@@ -111,8 +111,8 @@ namespace OpenTween
         [Theory]
         [InlineData("ja-JP", "ja-JP")]
         [InlineData("fr-FR", "en")] // 対応するカルチャが無い場合は en にフォールバックする
-        [InlineData("zh-CN", "zh-CN")] // zh-CHS は zh-CN を内包する
-        [InlineData("zh-TW", "en")] // zh-CHS は zh-TW を内包しない (台湾は繁体字圏)
+        [InlineData("zh-CN", "en")] // zh-CHS リソースは v1.3.7 から削除
+        [InlineData("zh-TW", "en")]
         public void GetPreferredCulture_Test(string currentCulture, string expectedCulture)
         {
             var actual = MyApplication.GetPreferredCulture(new CultureInfo(currentCulture));

diff --git a/OpenTween/ApplicationEvents.cs b/OpenTween/ApplicationEvents.cs
index e4842d0..c0d60d2 100644 (file)
--- a/OpenTween/ApplicationEvents.cs
+++ b/OpenTween/ApplicationEvents.cs
@@ -47,7 +47,6 @@ namespace OpenTween
         {
             new CultureInfo("en"), // 先頭のカルチャはフォールバック先として使用される
             new CultureInfo("ja"),
-            new CultureInfo("zh-CHS"),
         };
 
         /// <summary>

diff --git a/OpenTween/Setting/Panel/PreviewPanel.Designer.cs b/OpenTween/Setting/Panel/PreviewPanel.Designer.cs
index 617da71..28c4798 100644 (file)
--- a/OpenTween/Setting/Panel/PreviewPanel.Designer.cs
+++ b/OpenTween/Setting/Panel/PreviewPanel.Designer.cs
@@ -112,8 +112,7 @@
             this.LanguageCombo.Items.AddRange(new object[] {
             resources.GetString("LanguageCombo.Items"),
             resources.GetString("LanguageCombo.Items1"),
-            resources.GetString("LanguageCombo.Items2"),
-            resources.GetString("LanguageCombo.Items3")});
+            resources.GetString("LanguageCombo.Items2")});
             resources.ApplyResources(this.LanguageCombo, "LanguageCombo");
             this.LanguageCombo.Name = "LanguageCombo";
             // 

diff --git a/OpenTween/Setting/Panel/PreviewPanel.cs b/OpenTween/Setting/Panel/PreviewPanel.cs
index 384c24a..7ce27ed 100644 (file)
--- a/OpenTween/Setting/Panel/PreviewPanel.cs
+++ b/OpenTween/Setting/Panel/PreviewPanel.cs
@@ -118,9 +118,6 @@ namespace OpenTween.Setting.Panel
                 case "en":
                     this.LanguageCombo.SelectedIndex = 2;
                     break;
-                case "zh-CN":
-                    this.LanguageCombo.SelectedIndex = 3;
-                    break;
                 default:
                     this.LanguageCombo.SelectedIndex = 0;
                     break;
@@ -207,9 +204,6 @@ namespace OpenTween.Setting.Panel
                 case 2:
                     settingCommon.Language = "en";
                     break;
-                case 3:
-                    settingCommon.Language = "zh-CN";
-                    break;
                 default:
                     settingCommon.Language = "en";
                     break;

diff --git a/OpenTween/Setting/Panel/PreviewPanel.resx b/OpenTween/Setting/Panel/PreviewPanel.resx
index c9fed6e..725c5a0 100644 (file)
--- a/OpenTween/Setting/Panel/PreviewPanel.resx
+++ b/OpenTween/Setting/Panel/PreviewPanel.resx
@@ -378,9 +378,6 @@ Growl.CoreLibrary.DLL</value>
   <data name="LanguageCombo.Items2" xml:space="preserve">
     <value>English</value>
   </data>
-  <data name="LanguageCombo.Items3" xml:space="preserve">
-    <value>Simplified Chinese</value>
-  </data>
   <data name="LanguageCombo.Location" type="System.Drawing.Point, System.Drawing">
     <value>276, 300</value>
   </data>