Some smaller refinements for the localization stuff.

wcjohns · wcjohns · commit 7f579153f82d · 2025-09-17T23:05:20.000-07:00
diff --git a/InterSpec_resources/app_text/InterSpec.xml b/InterSpec_resources/app_text/InterSpec.xml
@@ -85,6 +85,7 @@
   <message id="intrinsic-activity">Intrinsic Activity</message>
   <message id="Calibration">Calibration</message>
   <message id="Unknown">Unknown</message>
+  <message id="keV">keV</message>
   <message id="Energy (keV)">Energy (keV)</message>
   <message id="Efficiency">Efficiency</message>
   <message id="stable">stable</message>
@@ -392,6 +393,7 @@
   <message id="app-mi-tt-help-pref-load-prev">At application start, automatically load previous state, if not set to be prompted.</message>
   <message id="warn-desktop-disp-switch">Changes will not take effect until app is restarted or refreshed.</message>
   <message id="warn-desktop-disp-switch-refresh">Refresh Session</message>
+  <message id="warn-language-restart">Not all fields will be updated with the new language - restart the application for total update.</message>
 
 
 
@@ -585,6 +587,7 @@
   <message id="lang-vi">Tiếng Việt</message>
   <message id="lang-tr">Türkçe</message>
   <message id="lang-ar">العربية</message>
+  <message id="lang-hu">Magyar</message>
 
 
   <!-- An incomplete list of possible countries - mapping the two letter code we receive as part of
diff --git a/InterSpec_resources/app_text/InterSpec_ar.xml b/InterSpec_resources/app_text/InterSpec_ar.xml
@@ -85,6 +85,7 @@
   <message id="intrinsic-activity">النشاط الجوهري</message>
   <message id="Calibration">المعايرة</message>
   <message id="Unknown">غير معروف</message>
+  <message id="keV">كيلوإلكترون فولت</message>
   <message id="Energy (keV)">الطاقة (كيلوإلكترون فولت)</message>
   <message id="Efficiency">الكفاءة</message>
   <message id="stable">مستقر</message>
@@ -353,6 +354,7 @@
   <message id="app-mi-tt-help-pref-load-prev">عند بدء التطبيق، قم بتحميل الحالة السابقة تلقائيًا، إذا لم يتم تعيينها للمطالبة.</message>
   <message id="warn-desktop-disp-switch">لن تسري التغييرات حتى إعادة تشغيل التطبيق أو تحديثه.</message>
   <message id="warn-desktop-disp-switch-refresh">تحديث الجلسة</message>
+  <message id="warn-language-restart">لن يتم تحديث جميع الحقول باللغة الجديدة - أعد تشغيل التطبيق للتحديث الكامل.</message>
 
 
 
diff --git a/InterSpec_resources/app_text/InterSpec_es.xml b/InterSpec_resources/app_text/InterSpec_es.xml
@@ -393,6 +393,7 @@
   <message id="app-mi-tt-help-pref-load-prev">Al iniciar la aplicación, cargar automáticamente el estado anterior, si no está configurado para preguntar.</message>
   <message id="warn-desktop-disp-switch">Los cambios no tendrán efecto hasta que la aplicación se reinicie o se actualice.</message>
   <message id="warn-desktop-disp-switch-refresh">Actualizar sesión</message>
+  <message id="warn-language-restart">No todos los campos se actualizarán con el nuevo idioma - reinicie la aplicación para una actualización completa.</message>
 
 
 
diff --git a/InterSpec_resources/app_text/InterSpec_fr.xml b/InterSpec_resources/app_text/InterSpec_fr.xml
@@ -86,6 +86,7 @@
   <message id="intrinsic-activity">Activité intrinsèque</message>
   <message id="Calibration">Calibrage</message>
   <message id="Unknown">Inconnu</message>
+  <message id="keV">keV</message>
   <message id="Energy (keV)">Énergie (keV)</message>
   <message id="Efficiency">Efficacité</message>
   <message id="stable">stable</message>
@@ -393,6 +394,7 @@
   <message id="app-mi-tt-help-pref-load-prev">Au démarrage de l'application, charger automatiquement l'état précédent, si pas configuré pour être invité.</message>
   <message id="warn-desktop-disp-switch">Les changements ne prendront effet qu'après le redémarrage ou la réactualisation de l'application.</message>
   <message id="warn-desktop-disp-switch-refresh">Actualiser la session</message>
+  <message id="warn-language-restart">Tous les champs ne seront pas mis à jour avec la nouvelle langue - redémarrez l'application pour une mise à jour complète.</message>
 
 
 
diff --git a/InterSpec_resources/app_text/InterSpec_ru.xml b/InterSpec_resources/app_text/InterSpec_ru.xml
@@ -86,6 +86,7 @@
   <message id="intrinsic-activity">Внутренняя активность</message>
   <message id="Calibration">Калибровка</message>
   <message id="Unknown">Неизвестно</message>
+  <message id="keV">кэВ</message>
   <message id="Energy (keV)">Энергия (кэВ)</message>
   <message id="Efficiency">Эффективность</message>
   <message id="stable">стабильный</message>
@@ -393,6 +394,7 @@
   <message id="app-mi-tt-help-pref-load-prev">При запуске приложения автоматически загружать предыдущее состояние, если не установлено предложение.</message>
   <message id="warn-desktop-disp-switch">Изменения не вступят в силу до перезапуска или обновления приложения.</message>
   <message id="warn-desktop-disp-switch-refresh">Обновить сессию</message>
+  <message id="warn-language-restart">Не все поля будут обновлены с новым языком - перезапустите приложение для полного обновления.</message>
 
 
 
diff --git a/InterSpec_resources/app_text/RelActAutoGui.xml b/InterSpec_resources/app_text/RelActAutoGui.xml
@@ -13,6 +13,7 @@
   
   <!-- General options -->
   <message id="raag-spectrum-peak-options">Spectrum and Peak Options</message>
+  <message id="raag-rel-eff-curve-options">Relative Efficiency Curve Options</message>
   <message id="raag-fit-energy-cal">Fit Energy Cal.</message>
   <message id="raag-back-sub">Back. Sub.</message>
   <message id="raag-fwhm-est">FWHM Est.</message>
diff --git a/InterSpec_resources/app_text/RelActAutoGuiEnergyRange.xml b/InterSpec_resources/app_text/RelActAutoGuiEnergyRange.xml
@@ -5,7 +5,6 @@
   <!-- Labels -->
   <message id="raager-lower-energy">Lower Energy</message>
   <message id="raager-upper-energy">Upper Energy</message>
-  <message id="raager-kev">keV</message>
   <message id="raager-continuum-type">Continuum Type:</message>
   
   <!-- Checkboxes -->
diff --git a/InterSpec_resources/app_text/RelActAutoGuiEnergyRange_ar.xml b/InterSpec_resources/app_text/RelActAutoGuiEnergyRange_ar.xml
@@ -5,7 +5,6 @@
   <!-- Labels -->
   <message id="raager-lower-energy">الطاقة الدنيا</message>
   <message id="raager-upper-energy">الطاقة العليا</message>
-  <message id="raager-kev">كيلوإلكترون فولت</message>
   <message id="raager-continuum-type">نوع المتصل:</message>
   
   <!-- Checkboxes -->
diff --git a/InterSpec_resources/app_text/RelActAutoGuiEnergyRange_fr.xml b/InterSpec_resources/app_text/RelActAutoGuiEnergyRange_fr.xml
@@ -5,7 +5,6 @@
   <!-- Labels -->
   <message id="raager-lower-energy">Énergie inférieure</message>
   <message id="raager-upper-energy">Énergie supérieure</message>
-  <message id="raager-kev">keV</message>
   <message id="raager-continuum-type">Type de continuum :</message>
   
   <!-- Checkboxes -->
diff --git a/InterSpec_resources/app_text/RelActAutoGuiEnergyRange_ru.xml b/InterSpec_resources/app_text/RelActAutoGuiEnergyRange_ru.xml
@@ -5,7 +5,6 @@
   <!-- Labels -->
   <message id="raager-lower-energy">Нижняя энергия</message>
   <message id="raager-upper-energy">Верхняя энергия</message>
-  <message id="raager-kev">кэВ</message>
   <message id="raager-continuum-type">Тип континуума:</message>
   
   <!-- Checkboxes -->
diff --git a/InterSpec_resources/app_text/RelActAutoGui_ar.xml b/InterSpec_resources/app_text/RelActAutoGui_ar.xml
@@ -13,6 +13,7 @@
   
   <!-- General options -->
   <message id="raag-spectrum-peak-options">خيارات الطيف والقمة</message>
+  <message id="raag-rel-eff-curve-options">خيارات منحنى الكفاءة النسبية</message>
   <message id="raag-fit-energy-cal">ملائمة معايرة الطاقة</message>
   <message id="raag-back-sub">طرح الخلفية</message>
   <message id="raag-fwhm-est">تقدير FWHM</message>
diff --git a/InterSpec_resources/app_text/RelActAutoGui_fr.xml b/InterSpec_resources/app_text/RelActAutoGui_fr.xml
@@ -13,6 +13,7 @@
   
   <!-- General options -->
   <message id="raag-spectrum-peak-options">Options de spectre et de pics</message>
+  <message id="raag-rel-eff-curve-options">Options de courbe d'efficacité relative</message>
   <message id="raag-fit-energy-cal">Ajust. énergie cal.</message>
   <message id="raag-back-sub">Soustract. fond</message>
   <message id="raag-fwhm-est">Estim. FWHM</message>
diff --git a/InterSpec_resources/app_text/RelActAutoGui_ru.xml b/InterSpec_resources/app_text/RelActAutoGui_ru.xml
@@ -13,6 +13,7 @@
   
   <!-- General options -->
   <message id="raag-spectrum-peak-options">Параметры спектра и пиков</message>
+  <message id="raag-rel-eff-curve-options">Параметры кривой относительной эффективности</message>
   <message id="raag-fit-energy-cal">Подгонка энергокал.</message>
   <message id="raag-back-sub">Вычит. фона</message>
   <message id="raag-fwhm-est">Оценка ПШПВ</message>
diff --git a/InterSpec_resources/app_text/create_translate_prompt.md b/InterSpec_resources/app_text/create_translate_prompt.md
@@ -7,6 +7,7 @@ The XML files in the `InterSpec_resources/app_text` directory are used to provid
 - English is the base, and "truth" information language.  All translations should be done from English, to the target laguage.
 - The XML files given in English are named according to the ".cpp" file that they primarily provide strings for.  For example `InterSpec.xml` gives the strings for `src/InterSpec.cpp`, and `FluxTool.xml` gives strings for `src/FluxTool.cpp`.  The translated XML files all end with an underscore and the two-letter country code, and optionally a dash with specialization, and then the ".xml".  For example `InterSpec_fr.xml` contain the French strings, `InterSpec_de.xml` the german, `InterSpec_en-GB.xml` the British English strings, and so on.
 - To add a language, you do not need to translate all elements in an XML file, or all XML files.  For any element, or file you do not translate, InterSpec will fall back to using the default (English) values for those strings.  
+- Please make sure the translated file contains a "<message>" element for evenry element in the original English file.
 - For strings that are less than or equal to about 5 words, you can assume that the string labels a GUI element (e.g., the label for an input, or the text in a button).  For these strings, translating in a compact and succinct manner is paramount, because if the string is too long, it may mess the layout of the application up.
 - Translation of individual strings should take the context of the file and application into account, because this is how the user will be seeing the string - this may help to shorten some translations.
 - Comments and aextra attributes in the XML should be kept in the translated XML.
@@ -18,7 +19,11 @@ The XML files in the `InterSpec_resources/app_text` directory are used to provid
 
 # Instructions for translating
 
-For each English XML file in `InterSpec_resources/app_text` please create a translated XML file, named according to the above rules, for the target language.  If anything isnt clear, or there are questions about the meaning of a string - please see the InterSpec source code (your can search for the "id" attribute value in the source code), or ask questions!
+For each English XML file in `InterSpec_resources/app_text` please create a translated XML file, named according to the above rules, for the target language.  If anything is not clear, or there are questions about the meaning of a string - please see the InterSpec source code (your can search for the "id" attribute value in the source code), or ask questions!
+
+Also, importantly, if the phrase being translated is under about 5 English words, please choose as short and succinct translation as you can (the string is probably labeling a GUI element, where space is often limited), making sure it still makes sense in context.
+
+Also, please make sure to translate all English XML files to the target language, and translate each "<message>" entry in the original XML to the target XML.
 
 # Language and Country specific instructions
 
diff --git a/src/InterSpec.cpp b/src/InterSpec.cpp
@@ -1651,6 +1651,10 @@ void InterSpec::changeLocale( std::string languageCode )
   }else
   {
     wApp->setLocale( WLocale( languageCode ) );
+    
+    // Validation of distance/activity/whatever will not get updated, and ther are some strings
+    //  like `WString("{1}: ").arg(WString::tr("some-localized-str"))` that wont update.
+    passMessage( WString::tr("warn-language-restart"), WarningWidget::WarningMsgHigh );
   }
 }//void changeLocale( std::string locale );
 
diff --git a/src/IsotopeSearchByEnergy.cpp b/src/IsotopeSearchByEnergy.cpp
@@ -159,7 +159,7 @@ IsotopeSearchByEnergy::SearchEnergy::SearchEnergy( Wt::WContainerWidget *p )
 {
   addStyleClass( "SearchEnergy" );
   
-  WLabel *label = new WLabel( "Energy", this );
+  WLabel *label = new WLabel( WString::tr("Energy"), this );
   label->addStyleClass( "SearchEnergyLabel" );
   
   m_energy = new NativeFloatSpinBox( this );
@@ -179,7 +179,7 @@ IsotopeSearchByEnergy::SearchEnergy::SearchEnergy( Wt::WContainerWidget *p )
   m_window->setValue( 10.0f );
   m_window->enterPressed().connect( this, &SearchEnergy::emitEnter );
   
-  label = new WLabel( "keV", this );
+  label = new WLabel( WString::tr("keV"), this );
   label->addStyleClass( "KeVLabel" );
   
   m_energy->valueChanged().connect( this, &SearchEnergy::emitChanged );
diff --git a/src/RelActAutoGui.cpp b/src/RelActAutoGui.cpp
@@ -821,7 +821,7 @@ RelActAutoGui::RelActAutoGui( InterSpec *viewer, Wt::WContainerWidget *parent )
   m_add_uncert->setCurrentIndex( static_cast<int>(RelActAutoGui::AddUncert::StatOnly) );
     
   
-  WGroupBox *optionsDiv = new WGroupBox( "Relative Efficiency Curve Options", this );
+  WGroupBox *optionsDiv = new WGroupBox( WString::tr("raag-rel-eff-curve-options"), this );
   optionsDiv->addStyleClass( "RelActAutoOptions" );
 
   m_rel_eff_opts_stack = new WStackedWidget();
diff --git a/src/RelActAutoGuiEnergyRange.cpp b/src/RelActAutoGuiEnergyRange.cpp
@@ -74,7 +74,7 @@ RelActAutoGuiEnergyRange::RelActAutoGuiEnergyRange( WContainerWidget *parent )
   m_lower_energy->setSpinnerHidden( true );
   label->setBuddy( m_lower_energy );
   
-  label = new WLabel( WString::tr("raager-kev"), this );
+  label = new WLabel( WString::tr("keV"), this );
   label->addStyleClass( "GridThirdCol GridFirstRow" );
   
   label = new WLabel( WString::tr("raager-upper-energy"), this );
@@ -85,7 +85,7 @@ RelActAutoGuiEnergyRange::RelActAutoGuiEnergyRange( WContainerWidget *parent )
   m_upper_energy->setSpinnerHidden( true );
   label->setBuddy( m_upper_energy );
   
-  label = new WLabel( WString::tr("raager-kev"), this );
+  label = new WLabel( WString::tr("keV"), this );
   label->addStyleClass( "GridThirdCol GridSecondRow" );
   
   m_lower_energy->valueChanged().connect( this, &RelActAutoGuiEnergyRange::handleEnergyChange );
