fix: split the apple locale on the region for LANG

We use AppleLocale to get the desired language when running on macos.
Unfortunately, if a region is set, the locale is not equivalent to the
LANG environment variable. It appends an extra region field that we did
not previously filter out. This change ensures that it will be filtered
out when present.

src/app/common/modals/alert.tsx

@@ -44,7 +44,7 @@ class AlertModal extends React.Component<{}, {}> {
                         <Markdown text={message?.message ?? ""} extraClassName="bottom-margin" />
                     </If>
                     <If condition={!message?.markdown}>{message?.message}</If>
-                    <If condition={message?.confirmflag}>
+                    <If condition={message.confirmflag}>
                         <Checkbox
                             onChange={this.handleDontShowAgain}
                             label={"Don't show me this again"}

src/models/bookmarks.ts

@@ -206,7 +206,7 @@ class BookmarksModel {
     }
 
     handleDocKeyDown(e: any): void {
-        const waveEvent = adaptFromReactOrNativeKeyEvent(e);
+        let waveEvent = adaptFromReactOrNativeKeyEvent(e);
         if (checkKeyPressed(waveEvent, "Escape")) {
             e.preventDefault();
             if (this.editingBookmark.get() != null) {

src/models/clientsettingsview.ts

@@ -3,7 +3,6 @@
 
 import * as mobx from "mobx";
 import { Model } from "./model";
-import { checkKeyPressed, adaptFromReactOrNativeKeyEvent } from "@/util/keyutil";
 
 class ClientSettingsViewModel {
     globalModel: Model;
@@ -22,15 +21,6 @@ class ClientSettingsViewModel {
             this.globalModel.activeMainView.set("clientsettings");
         })();
     }
-
-    handleDocKeyDown(e: any): void {
-        const waveEvent = adaptFromReactOrNativeKeyEvent(e);
-        if (checkKeyPressed(waveEvent, "Escape")) {
-            e.preventDefault();
-            this.closeView();
-            return;
-        }
-    }
 }
 
 export { ClientSettingsViewModel };

src/models/connectionsview.ts

@@ -3,7 +3,6 @@
 
 import * as mobx from "mobx";
 import { Model } from "./model";
-import { checkKeyPressed, adaptFromReactOrNativeKeyEvent } from "@/util/keyutil";
 
 class ConnectionsViewModel {
     globalModel: Model;
@@ -22,15 +21,6 @@ class ConnectionsViewModel {
             this.globalModel.activeMainView.set("connections");
         })();
     }
-
-    handleDocKeyDown(e: any): void {
-        const waveEvent = adaptFromReactOrNativeKeyEvent(e);
-        if (checkKeyPressed(waveEvent, "Escape")) {
-            e.preventDefault();
-            this.closeView();
-            return;
-        }
-    }
 }
 
 export { ConnectionsViewModel };

src/models/historyview.ts

@@ -291,7 +291,7 @@ class HistoryViewModel {
     }
 
     handleDocKeyDown(e: any): void {
-        const waveEvent = adaptFromReactOrNativeKeyEvent(e);
+        let waveEvent = adaptFromReactOrNativeKeyEvent(e);
         if (checkKeyPressed(waveEvent, "Escape")) {
             e.preventDefault();
             this.closeView();

src/models/modals.ts

@@ -18,11 +18,10 @@ class ModalsModel {
         }
     }
 
-    popModal(callback?: () => void) {
+    popModal() {
         mobx.action(() => {
             this.store.pop();
         })();
-        callback && callback();
     }
 }
 

src/models/model.ts

@@ -372,6 +372,7 @@ class Model {
     cancelAlert(): void {
         mobx.action(() => {
             this.alertMessage.set(null);
+            this.modalsModel.popModal();
         })();
         if (this.alertPromiseResolver != null) {
             this.alertPromiseResolver(false);
@@ -492,7 +493,7 @@ class Model {
         if (this.alertMessage.get() != null) {
             if (checkKeyPressed(waveEvent, "Escape")) {
                 e.preventDefault();
-                this.modalsModel.popModal(() => this.cancelAlert());
+                this.cancelAlert();
                 return;
             }
             if (checkKeyPressed(waveEvent, "Enter")) {
@@ -502,10 +503,6 @@ class Model {
             }
             return;
         }
-        if (checkKeyPressed(waveEvent, "Escape") && this.modalsModel.store.length > 0) {
-            this.modalsModel.popModal();
-            return;
-        }
         if (this.activeMainView.get() == "bookmarks") {
             this.bookmarksModel.handleDocKeyDown(e);
         }
@@ -513,10 +510,10 @@ class Model {
             this.historyViewModel.handleDocKeyDown(e);
         }
         if (this.activeMainView.get() == "connections") {
-            this.connectionViewModel.handleDocKeyDown(e);
+            this.historyViewModel.handleDocKeyDown(e);
         }
         if (this.activeMainView.get() == "clientsettings") {
-            this.clientSettingsViewModel.handleDocKeyDown(e);
+            this.historyViewModel.handleDocKeyDown(e);
         } else {
             if (checkKeyPressed(waveEvent, "Escape")) {
                 e.preventDefault();
@@ -524,6 +521,9 @@ class Model {
                     this.showSessionView();
                     return;
                 }
+                if (this.clearModals()) {
+                    return;
+                }
                 const inputModel = this.inputModel;
                 inputModel.toggleInfoMsg();
                 if (inputModel.inputMode.get() != null) {
@@ -643,6 +643,33 @@ class Model {
         return screen.getTermWrap(line.lineid);
     }
 
+    clearModals(): boolean {
+        let didSomething = false;
+        mobx.action(() => {
+            if (this.screenSettingsModal.get()) {
+                this.screenSettingsModal.set(null);
+                didSomething = true;
+            }
+            if (this.sessionSettingsModal.get()) {
+                this.sessionSettingsModal.set(null);
+                didSomething = true;
+            }
+            if (this.screenSettingsModal.get()) {
+                this.screenSettingsModal.set(null);
+                didSomething = true;
+            }
+            if (this.clientSettingsModal.get()) {
+                this.clientSettingsModal.set(false);
+                didSomething = true;
+            }
+            if (this.lineSettingsModal.get()) {
+                this.lineSettingsModal.set(null);
+                didSomething = true;
+            }
+        })();
+        return didSomething;
+    }
+
     restartWaveSrv(): void {
         getApi().restartWaveSrv();
     }

wavesrv/pkg/scbase/scbase.go

@@ -393,7 +393,9 @@ func determineLang() string {
 			log.Printf("error executing 'defaults read -g AppleLocale': %v\n", err)
 			return ""
 		}
-		return strings.TrimSpace(string(out)) + ".UTF-8"
+		strOut := string(out)
+		truncOut := strings.Split(strOut, "@")[0]
+		return strings.TrimSpace(truncOut) + ".UTF-8"
 	} else {
 		// this is specifically to get the wavesrv LANG so waveshell
 		// on a remote uses the same LANG