fix: Add optional language tag for Lift export

sillsdev · Mar 2, 2022 · bfabdf9 · bfabdf9
1 parent a5ae617
commit bfabdf9
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 12 deletions.
diff --git a/Src/Lang/SA_DEU.rc b/Src/Lang/SA_DEU.rc
@@ -2480,9 +2480,11 @@ BEGIN
     DEFPUSHBUTTON   "Export",IDOK,123,243,50,14,WS_DISABLED
     GROUPBOX        "Include",IDC_STATIC,9,6,271,170
     PUSHBUTTON      "&Help",IDHELP,231,243,50,14
-    LTEXT           "Export Folder",IDC_STATIC_FIELDWORKS_PROJECT,15,181,260,8
-    EDITTEXT        IDC_EDIT_FOLDER,15,195,212,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse...",IDC_BROWSE,231,195,50,14
+    LTEXT           "Language Tag if Orthographic blank", IDC_OPTIONAL_LANGUAGE_TAG_LABEL, 15, 181, 260, 8
+    EDITTEXT        IDC_OPTIONAL_LANGUAGE_TAG, 15, 195, 212, 14, ES_AUTOHSCROLL | ES_WANTRETURN
+    LTEXT           "Export Folder", IDC_STATIC_FIELDWORKS_PROJECT, 15, 214, 260, 8
+    EDITTEXT        IDC_EDIT_FOLDER, 15, 225, 212, 14, ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_BROWSE,231,225,50,14
 END
 
 IDD_SELECT_TRANSCRIPTION_BARS DIALOGEX 0, 0, 116, 144

diff --git a/Src/Lang/SA_ENU.rc b/Src/Lang/SA_ENU.rc
@@ -46,7 +46,7 @@ VALUE "CompanyName", "SIL International"
 VALUE "FileDescription", "Speech Analyzer Resource DLL"
 VALUE "FileVersion", "v3.1.1.2"
 VALUE "InternalName", "SA_ENU"
-VALUE "LegalCopyright", "� 1996-2021 SIL International"
+VALUE "LegalCopyright", "� 1996-2021 SIL International"
 VALUE "OriginalFilename", "SA_ENU.dll"
 VALUE "ProductName", "SA"
 VALUE "ProductVersion", "2.0.0.0"
@@ -2191,7 +2191,7 @@ GROUPBOX        "Waveform", IDC_STATIC, 2, 148, 247, 26
 LTEXT           "Order:", IDC_STATIC, 93, 108, 20, 8
 EDITTEXT        IDC_RESEARCH_LPC_ORDER_FS_MULT_EDIT, 120, 107, 14, 12, ES_AUTOHSCROLL
 EDITTEXT        IDC_RESEARCH_LPC_ORDER_EXTRA_EDIT, 153, 107, 14, 12, ES_AUTOHSCROLL
-LTEXT           "�Fs +", IDC_STATIC, 135, 109, 18, 8
+LTEXT           "�Fs +", IDC_STATIC, 135, 109, 18, 8
 EDITTEXT        IDC_RESEARCH_LPC_ORDER_AUX_MAX_EDIT, 179, 107, 15, 12, ES_AUTOHSCROLL
 LTEXT           "+", IDC_STATIC, 171, 109, 8, 8
 LTEXT           "(max) aux poles", IDC_STATIC, 196, 109, 51, 9
@@ -2480,9 +2480,11 @@ PUSHBUTTON      "Cancel", IDCANCEL, 177, 243, 50, 14
 DEFPUSHBUTTON   "Export", IDOK, 123, 243, 50, 14, WS_DISABLED
 GROUPBOX        "Include", IDC_STATIC, 9, 6, 271, 170
 PUSHBUTTON      "&Help", IDHELP, 231, 243, 50, 14
-LTEXT           "Export Folder", IDC_STATIC_FIELDWORKS_PROJECT, 15, 181, 260, 8
-EDITTEXT        IDC_EDIT_FOLDER, 15, 195, 212, 14, ES_AUTOHSCROLL
-PUSHBUTTON      "Browse...", IDC_BROWSE, 231, 195, 50, 14
+LTEXT           "Language Tag if Orthographic blank", IDC_OPTIONAL_LANGUAGE_TAG_LABEL, 15, 181, 260, 8
+EDITTEXT        IDC_OPTIONAL_LANGUAGE_TAG, 15, 195, 212, 14, ES_AUTOHSCROLL | ES_WANTRETURN
+LTEXT           "Export Folder", IDC_STATIC_FIELDWORKS_PROJECT, 15, 214, 260, 8
+EDITTEXT        IDC_EDIT_FOLDER, 15, 225, 212, 14, ES_AUTOHSCROLL
+PUSHBUTTON      "Browse...", IDC_BROWSE, 231, 225, 50, 14
 END
 
 IDD_SELECT_TRANSCRIPTION_BARS DIALOGEX 0, 0, 116, 144
@@ -4859,7 +4861,7 @@ END
 
 STRINGTABLE
 BEGIN
-VS_COPYRIGHT            "� 1996-2021 SIL International.\nAll Rights Reserved."
+VS_COPYRIGHT            "� 1996-2021 SIL International.\nAll Rights Reserved."
 IDR_MAINFRAME_SA        "Speech Analyzer"
 IDR_MAINFRAME_AS        "Audio-Sync"
 IDR_SPEECHANALYZER      "\nSA\nSA Document\nWAV Files (*.wav)\n.wav\nannFileType\nANN File Type"

diff --git a/Src/Lang/sa_lang_resource.h b/Src/Lang/sa_lang_resource.h
@@ -1250,6 +1250,8 @@
 #define IDC_CHECK_USE_LAST_FILE         2066
 #define IDC_RADIO_FIELDWORKS            2067
 #define IDC_RADIO_OTHER                 2068
+#define IDC_OPTIONAL_LANGUAGE_TAG_LABEL 2069
+#define IDC_OPTIONAL_LANGUAGE_TAG       2070
 #define IDC_EDIT_FIELDWORKS_FOLDER      2071
 #define IDC_STATIC_OTHER                2072
 #define IDC_STATIC_FIELDWORKS           2073

diff --git a/Src/SA/DlgExportLift.cpp b/Src/SA/DlgExportLift.cpp
@@ -140,6 +140,7 @@ void CDlgExportLift::DoDataExchange(CDataExchange * pDX) {
     DDX_Control(pDX, IDC_LIST_MUSIC_PL1, ctlPhraseList1List);
     DDX_Control(pDX, IDC_LIST_MUSIC_PL2, ctlPhraseList2List);
     DDX_Control(pDX, IDC_EDIT_FOLDER, ctlEditFolder);
+    DDX_CBString(pDX, IDC_OPTIONAL_LANGUAGE_TAG, settings.optionalLanguageTag);
 
     if (pDX->m_bSaveAndValidate) {
 

diff --git a/Src/SA/ExportLiftSettings.h b/Src/SA/ExportLiftSettings.h
@@ -25,6 +25,7 @@ class CExportLiftSettings {
     wstring phrase1;
     wstring phrase2;
 
+    CSaString optionalLanguageTag;
     CString szDocTitle;
     CString szPath;
 };

diff --git a/Src/SA/Sa_Doc.cpp b/Src/SA/Sa_Doc.cpp
@@ -7481,12 +7481,12 @@ bool CSaDoc::ExportSegments(CExportLiftSettings & settings,
 				entry.lexical_unit.get().form.append(Lift13::form(L"form", settings.ortho.c_str(), Lift13::text(LTEXT, Lift13::span(SPAN, results[ORTHO]))));
 			}
 
-			// Build the IPA language tags from what's available (Orthographic or "Ethnologue ID"). Fall back to "und" (BCP-47 for undefined)
+			// Build the IPA language tags from what's available (Orthographic or "Optional Language Tag"). Fall back to "und" (BCP-47 for undefined)
 			wstring vernacular = L"und";
 			if (settings.bOrtho) {
 				vernacular = settings.ortho;
-			} else if (m_sourceParm.szEthnoID.Compare(L"   ") != 0) {
-				vernacular = FileUtils::Trim(wstring(m_sourceParm.szEthnoID));
+			} else if (!settings.optionalLanguageTag.IsEmpty()) {
+				vernacular = settings.optionalLanguageTag;
 			}
 
 			// add the phonetic