Update language strings, message box, remove restart feature on setti…

…ngs form (for good?)
CatmanFan · Jan 11, 2025 · fad229a · fad229a
1 parent f607274
commit fad229a
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 17 deletions.
diff --git a/FriishProduce/SettingsForm.cs b/FriishProduce/SettingsForm.cs
@@ -141,7 +141,7 @@ public void RefreshForm()
 
             // -----------------------------
 
-            Program.Lang.String(vc_sega_country);
+            vc_sega_country.Text = Program.Lang.String("region").TrimEnd(':', '：').Trim();
             vc_sega_dev_mdpad_enable_6b.Text = string.Format(Program.Lang.String("dev_mdpad_enable_6b", "vc_sega"), Program.Lang.Console(Platform.SMD));
             Program.Lang.String(vc_sega_console_disableresetbutton, "vc_sega");
 
@@ -444,15 +444,10 @@ private void OK_Click(object sender, EventArgs e)
             bool isDirty = isShown
                 && (dirtyOption1 != languages.SelectedIndex
                  || dirtyOption2 != reset_all_dialogs.Checked);
-            bool restart = isDirty && MessageBox.Show(Program.Lang.Msg(0), MessageBox.Buttons.YesNo, MessageBox.Icons.Information) == MessageBox.Result.Yes;
+            if (isDirty) MessageBox.Show(Program.Lang.Msg(0), MessageBox.Buttons.Ok, MessageBox.Icons.Information);
 
             isShown = false;
             DialogResult = DialogResult.OK;
-
-            if (restart)
-            {
-                Application.Restart();
-            }
         }
 
         private void Cancel_Click(object sender, EventArgs e)

diff --git a/FriishProduce/Strings/en.json b/FriishProduce/Strings/en.json
@@ -90,7 +90,7 @@
 		},
 
 		"messages": {
-			"000":								"An application restart is needed in order for changes to take effect.\nRestart now?",
+			"000":								"An application restart is needed in order for changes to fully take effect.",
 			"001":								"{0} has unsaved changes.\nWhat would you like to do?",
 			"002":								"The file you have selected is of an invalid format.",
 			"003":								"Successfully completed.\nOpen the output folder?",

diff --git a/FriishProduce/Strings/es.json b/FriishProduce/Strings/es.json
@@ -90,7 +90,7 @@
 		},
 
 		"messages": {
-			"000":								"Algunos cambios necesitan que se reinicie el programa para que tengan efecto.\n¿Reiniciar ahora?",
+			"000":								"Algunos cambios necesitan que se reinicie el programa para que tengan efecto.",
 		    "001":								"El proyecto \"{0}\" ha sido cambiado.\n¿Qué desea hacer?",
 			"002":								"El archivo seleccionado no es válido.",
 			"003":								"Exportado con éxito.\n¿Quieres abrir la carpeta de salida?",

diff --git a/FriishProduce/Strings/fr.json b/FriishProduce/Strings/fr.json
@@ -90,7 +90,7 @@
 		},
 
 		"messages": {
-			"000":								"Un redémarrage est nécessaire pour que tous les changements aux réglages prennent effet.\nRedémarrer maintenant?",
+			"000":								"Un redémarrage est nécessaire pour que tous les changements aux réglages prennent effet.",
 			"001":								"«{0}» comporte des modifications non enregistrées.\nQu'est-ce que vous voudrais faire ?",
 			"002":								"Le fichier précisé est invalide.",
 			"003":								"Terminé avec succès.\nOuvrir le dossier de sortie ?",
@@ -213,9 +213,9 @@
 			"image_resize1":					"Conserver les proportions",
 
 			"channel_metadata":					"Métadonnées de la chaîne",
-			"channel_name":						"Nom de la chaîne",
+			"channel_name":						"Nom de la chaîne :",
 			"title_id":							"Title ID :",
-			"video_mode":						"Mode vidéo",
+			"video_mode":						"Mode vidéo :",
 			"banner":							"Banner de la chaîne",
 			"banner_details":					"Détails du banner",
 			"banner_sound":						"Son du banner",

diff --git a/FriishProduce/Strings/ja.json b/FriishProduce/Strings/ja.json
diff --git a/FriishProduce/Strings/ko.json b/FriishProduce/Strings/ko.json
@@ -90,7 +90,7 @@
 		},
 
 		"messages": {
-			"000":								"변경 사항을 적용하려면 응용 프로그램을 다시 시작해야 합니다.\n지금 다시 시작할까요?",
+			"000":								"변경 사항을 적용하려면 응용 프로그램을 다시 시작해야 합니다.",
 			"001":								"{0}에 저장되지 않은 변경사항이 있습니다.\n무엇을 하겠습니까?",
 			"002":								"선택한 파일의 형식이 잘못되었습니다.",
 			"003":								"성공적으로 완료되었습니다.\n출력 폴더를 열까요?",

diff --git a/FriishProduce/Subforms/ContentOptions/Options_VC_SEGA.cs b/FriishProduce/Subforms/ContentOptions/Options_VC_SEGA.cs
@@ -31,7 +31,7 @@ public Options_VC_SEGA() : base()
                 controller_cb.Text = Program.Lang.String("controller", "projectform");
                 b_controller.Text = Program.Lang.String("controller_mapping", "projectform");
 
-                region.Text = Program.Lang.String("region");
+                region.Text = Program.Lang.String("region").TrimEnd(':', '：').Trim();
                 save_sram.Text = Program.Lang.String("save_data_enable", "projectform");
                 console_disableresetbutton.Text = Program.Lang.String("console_disableresetbutton", "vc_sega");
                 dev_mdpad_enable_6b.Text = string.Format(Program.Lang.String("dev_mdpad_enable_6b", "vc_sega"), Program.Lang.Console(Platform.SMD));

diff --git a/FriishProduce/_classes/Program/MessageBox.cs b/FriishProduce/_classes/Program/MessageBox.cs
@@ -143,10 +143,11 @@ public static Result Show(string mainText, string description, string[] buttons,
 
                 if (dontShow >= 0) { t.VerificationText = Program.Lang.String("do_not_show"); }
 
-                if (!string.IsNullOrEmpty(t.MainInstruction) && Program.Lang.GetScript(t.MainInstruction) == Language.ScriptType.CJK)
+                if (Program.Lang.GetScript(mainText) == Language.ScriptType.CJK)
                 {
-                    using System.Drawing.Font f = new(System.Drawing.SystemFonts.MessageBoxFont.FontFamily, 6.5f, System.Drawing.FontStyle.Regular);
-                    t.Width = Math.Max(t.Width, System.Windows.Forms.TextRenderer.MeasureText(t.MainInstruction, f).Width + 15);
+                    bool hasTitle = !string.IsNullOrEmpty(t.MainInstruction);
+                    using System.Drawing.Font f = new(System.Drawing.FontFamily.GenericSansSerif, hasTitle ? 6.5f : 5.5f, System.Drawing.FontStyle.Regular);
+                    t.Width = Math.Max(t.Width, System.Windows.Forms.TextRenderer.MeasureText(hasTitle ? t.MainInstruction : mainText, f).Width + (hasTitle ? 0 : 5));
                 }
 
                 var clicked = t.ShowDialog();