lang updates

2026-01-29 02:23:22 +08:00 · 2024-03-15 08:40:53 -07:00 · 2024-03-15 08:40:53 -07:00 · 768384b6c3
commit 768384b6c3
parent b30fdbb225
7 changed files with 90 additions and 68 deletions
--- a/.efrocachemap
+++ b/.efrocachemap
@ -421,7 +421,7 @@
  "build/assets/ba_data/audio/zoeOw.ogg": "74befe45a8417e95b6a2233c51992a26",
  "build/assets/ba_data/audio/zoePickup01.ogg": "48ab8cddfcde36a750856f3f81dd20c8",
  "build/assets/ba_data/audio/zoeScream01.ogg": "2b468aedfa8741090247f04eb9e6df55",
-  "build/assets/ba_data/data/langdata.json": "be5167b2e025e7542934a7fd2f9549ea",
+  "build/assets/ba_data/data/langdata.json": "10df7f9f3de205aefdba9c1cfd11333b",
  "build/assets/ba_data/data/languages/arabic.json": "2c2915e10124bb8f69206da9c608d57c",
  "build/assets/ba_data/data/languages/belarussian.json": "09954e550d13d3d9cb5a635a1d32a151",
  "build/assets/ba_data/data/languages/chinese.json": "bb51b5aa614830c561e8fe2542a9ab8a",
@ -432,7 +432,7 @@
  "build/assets/ba_data/data/languages/dutch.json": "b0900d572c9141897d53d6574c471343",
  "build/assets/ba_data/data/languages/english.json": "48fe4c6f97b07420238244309b54a61e",
  "build/assets/ba_data/data/languages/esperanto.json": "0e397cfa5f3fb8cef5f4a64f21cda880",
-  "build/assets/ba_data/data/languages/filipino.json": "bf97444c655cb831735b2378edf2273b",
+  "build/assets/ba_data/data/languages/filipino.json": "d2c943fda759269563d871ea99fe76f8",
  "build/assets/ba_data/data/languages/french.json": "917e4174d6f0eb7f00c27fd79cfbb924",
  "build/assets/ba_data/data/languages/german.json": "450fa41ae264f29a5d1af22143d0d0ad",
  "build/assets/ba_data/data/languages/gibberish.json": "a1afce99249645003017ebec50e716fe",
@ -447,14 +447,14 @@
  "build/assets/ba_data/data/languages/polish.json": "9d22c6643c097c4cb268d0d6b6319cd4",
  "build/assets/ba_data/data/languages/portuguese.json": "a48df1d11a088a1a2e6e3f66627444be",
  "build/assets/ba_data/data/languages/romanian.json": "b3e46efd6f869dbd78014570e037c290",
-  "build/assets/ba_data/data/languages/russian.json": "876b41939ee19f81327f4af3500de55a",
+  "build/assets/ba_data/data/languages/russian.json": "3efaaf5eac320fceef029501dec4109b",
  "build/assets/ba_data/data/languages/serbian.json": "d7452dd72ac0e51680cb39b5ebaa1c69",
  "build/assets/ba_data/data/languages/slovak.json": "c00fb27cf982ffad5a4370ad3b16bd21",
-  "build/assets/ba_data/data/languages/spanish.json": "04ac00160550266f6a0e05e6fcd66d37",
+  "build/assets/ba_data/data/languages/spanish.json": "a15adbfeb16be4a956e34b2515b60f10",
  "build/assets/ba_data/data/languages/swedish.json": "5142a96597d17d8344be96a603da64ac",
  "build/assets/ba_data/data/languages/tamil.json": "b9fcc523639f55e05c7f4e7914f3321a",
  "build/assets/ba_data/data/languages/thai.json": "1d665629361f302693dead39de8fa945",
-  "build/assets/ba_data/data/languages/turkish.json": "23f1204a85c94e9336fba04ef33f9d18",
+  "build/assets/ba_data/data/languages/turkish.json": "fcd90d63b5d3eae3eda5e94174008327",
  "build/assets/ba_data/data/languages/ukrainian.json": "3d75d21205c82db34fb1a1b014592747",
  "build/assets/ba_data/data/languages/venetian.json": "035034e0b4de696a41bf753ab4d0e194",
  "build/assets/ba_data/data/languages/vietnamese.json": "921cd1e50f60fe3e101f246e172750ba",
@ -4065,26 +4065,26 @@
  "build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1",
  "build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae",
  "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599",
-  "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "bc6f8e147e6b4e454309c0bf12fc5a2c",
-  "build/prefab/full/linux_arm64_gui/release/ballisticakit": "8a9af839c16aab4858977db6f1f49959",
-  "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "680f20eb7196eb5af1e5e0c02d2dc3f1",
-  "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "4dce976ca972e5372cfdbf6900241b13",
-  "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "1ef0d2ce6c640d5392df29b30eb7abb9",
-  "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "05e772df81a412b7ddd6f4f42d873c29",
-  "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "7534d0ad2beed76f4b8695ad59dd90bd",
-  "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "b5533d585420379f8a4f2ec22279f6cb",
-  "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "f8eb314eabf9db196c4e7cff63c72b47",
-  "build/prefab/full/mac_arm64_gui/release/ballisticakit": "62c35652f620e34f0c320978eb591f72",
-  "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "69a80b3a49384b77cac2b9ef8258b0ee",
-  "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "d4b1ec67c1439828c312dcede83809aa",
-  "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "67dc0b11058a7b7cf6208ea795c1da03",
-  "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "288acd2edde294904897b3d2bcc94d88",
-  "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "5ad834d84fcb860149b096340613d929",
-  "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "7d9b9c9161bf742e3b832c2e100c767e",
-  "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "343e5068337826107d40eaef36e81fa5",
-  "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "fd2c882d037f5c7212d5d08e3dacafa3",
-  "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "bb9b884d82488f051a785406d8dbf5c9",
-  "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "02d92886285684a19c5cf59e66b8f3b3",
+  "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "149d743d83a18e084cfbf58a84adb228",
+  "build/prefab/full/linux_arm64_gui/release/ballisticakit": "3fb406b63a8a0482e7a0e57c049752de",
+  "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "caf02452afe4e65975c7f9535b27683a",
+  "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "4bf0689c2cbbe41addaf0520ae857191",
+  "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "c9deccfc0bab6d7e75b21ef207426baf",
+  "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "0ccb34d6b0e586e56c06bf8c90742cc4",
+  "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "88dedfaea0f64ab39602180c9429b70b",
+  "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "efe59f8c0cc76591f61543df51b8d7ed",
+  "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "ac0191461830e5e01e30e676a3956a43",
+  "build/prefab/full/mac_arm64_gui/release/ballisticakit": "c7a2d46627fd4975bfd5d761e740aacf",
+  "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "1ec024ac773380ef606eaa5d434253ce",
+  "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "903b31f9272e4aecb2f76c6cf124d1db",
+  "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "f1c73d1b269912872fb1f2628b4855c2",
+  "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "b0f2002c5f7ae9b8bf0f4fe35e605c3a",
+  "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "f7d53e20544ade5352449182995b8b41",
+  "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "d5f348b8e877c332c3220b5c54401132",
+  "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "f2ae19e4d4b79b5974a4d8d60b8fe63b",
+  "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "551f4be9d132d1d4c9bae000dbc919e6",
+  "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "58e8e7f12acfd1859029acc9c241d134",
+  "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "0784650e667aee169eabf93de2df93db",
  "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "d9865523059d8cf11b2bef4b9da9a8c9",
  "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "56d6440f62c271c4ce9ef520400395a3",
  "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "d9865523059d8cf11b2bef4b9da9a8c9",
@ -4101,14 +4101,14 @@
  "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "c2cf0dc227e41a826c913d12e117c316",
  "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "fbdc80e41c5883b4a893d2f0786e377f",
  "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "c2cf0dc227e41a826c913d12e117c316",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "ceaca4c52ec11ea05a726d0f61c6c2ef",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "67c820bcbc296e3806504a0c26a3d251",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "ad2ee8752e52ba99f5c8bdf8e8fd368c",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "9cd95ef02c5fbe4d7c397899f88e0d46",
-  "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "202e5d5c0711310a91836f041177c8a4",
-  "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "1ad97b1a5fdff1de4f0fb4be70cf4584",
-  "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "767f1b629915507ef4b70f5afcc7a305",
-  "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "8021df36d1dccf0ee46eb7d7399ff1ca",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "199c8650599d295ca799b29e0bb4c7e7",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "bc136717d320ca791624141b3a246483",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "09113b8b33af70c34c3f980e3cc8581d",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "483ab966856762e946dfc04e635630d9",
+  "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "f1702ea6d5b6bae2b77e5a3184b1d417",
+  "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "47c9475678346309d9abe9cf78b4ab13",
+  "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "85e2286dbde53af296f02859f08cdc1a",
+  "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "80c5e2d583ce36bca136be488aa06a0c",
  "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c",
  "src/assets/ba_data/python/babase/_mgen/enums.py": "b611c090513a21e2fe90e56582724e9d",
  "src/ballistica/base/mgen/pyembed/binding_base.inc": "72bfed2cce8ff19741989dec28302f3f",
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,4 +1,4 @@
-### 1.7.33 (build 21790, api 8, 2024-03-14)
+### 1.7.33 (build 21793, api 8, 2024-03-15)
 - Stress test input-devices are now a bit smarter; they won't press any buttons
  while UIs are up (this could cause lots of chaos if it happened).
 - Added a 'Show Demos When Idle' option in advanced settings. If enabled, the
@ -49,18 +49,27 @@
 - Cleaned up builds when running under WSL. Things like `make mypy` should now
  work correctly there, and it should now be possible to build and run either
  Linux or Windows builds there.
+- Added an `allow_clear_button` arg to bauiv1.textwidget() which can be used to
+  disable the 'X' button that clears editable text widgets.

 ### 1.7.32 (build 21741, api 8, 2023-12-20)
 - Fixed a screen message that no one will ever see (Thanks vishal332008?...)
- Plugins window now displays 'No Plugins Installed' when no plugins are present (Thanks vishal332008!)
- Old messages are now displayed as soon as you press 'Unmute Chat' (Thanks vishal332008!)
+- Plugins window now displays 'No Plugins Installed' when no plugins are present
+  (Thanks vishal332008!)
+- Old messages are now displayed as soon as you press 'Unmute Chat' (Thanks
+  vishal332008!)
 - Added an 'Add to Favorites' entry to the party menu (Thanks vishal332008!)
- Now displays 'No Parties Added' in favorites tab if no favorites are present (Thanks vishal332008!)
+- Now displays 'No Parties Added' in favorites tab if no favorites are present
+  (Thanks vishal332008!)
 - Now shows character icons in the profiles list window (Thanks vishal332008!)
- Added a Random button for names in the Player Profiles window (Thanks vishal332008!)
- Fixed a bug where no server is selected by default in the favorites tab (Thanks vishal332008!)
- Fixed a bug where no replay is selected by default in the watch tab (Thanks vishal332008!)
- Fixed a bug where no profile is selected by default in the profile tab (Thanks vishal332008!)
+- Added a Random button for names in the Player Profiles window (Thanks
+  vishal332008!)
+- Fixed a bug where no server is selected by default in the favorites tab
+  (Thanks vishal332008!)
+- Fixed a bug where no replay is selected by default in the watch tab (Thanks
+  vishal332008!)
+- Fixed a bug where no profile is selected by default in the profile tab (Thanks
+  vishal332008!)
 - Fixed a number of UI screens so that ugly window edges are no longer visible
  in corners on modern ultra wide phone displays.
 - Added a `player_rejoin_cooldown` server config option. This defaults to 10
@ -75,8 +84,6 @@
  cleanly however (an `on_app_active_changed()` call in the `AppMode` class).
  This means that it also applies to other platforms when the app reaches the
  'inactive' state; for instance when minimizing the window on the SDL build.
- Added an `allow_clear_button` arg to bauiv1.textwidget() which can be used to
-  disable the 'X' button that clears editable text widgets.

 ### 1.7.31 (build 21727, api 8, 2023-12-17)
 - Added `bascenev1.get_connection_to_host_info_2()` which is an improved
--- a/src/assets/ba_data/python/baenv.py
+++ b/src/assets/ba_data/python/baenv.py
@ -52,7 +52,7 @@ if TYPE_CHECKING:

 # Build number and version of the ballistica binary we expect to be
 # using.
-TARGET_BALLISTICA_BUILD = 21790
+TARGET_BALLISTICA_BUILD = 21793
 TARGET_BALLISTICA_VERSION = '1.7.33'


--- a/src/assets/ba_data/python/bauiv1lib/popup.py
+++ b/src/assets/ba_data/python/bauiv1lib/popup.py
@ -129,8 +129,8 @@ class PopupMenuWindow(PopupWindow):
        if choices_display is None:
            choices_display = []

-        # FIXME: For the moment we base our width on these strings so
-        #  we need to flatten them.
+        # FIXME: For the moment we base our width on these strings so we
+        #  need to flatten them.
        choices_display_fin: list[str] = []
        for choice_display in choices_display:
            choices_display_fin.append(choice_display.evaluate())
@ -154,9 +154,9 @@ class PopupMenuWindow(PopupWindow):
        else:
            self._height = 20 + len(choices) * 33
            self._use_scroll = False
-        self._delegate = None  # don't want this stuff called just yet..
+        self._delegate = None  # Don't want this stuff called just yet.

-        # extend width to fit our longest string (or our max-width)
+        # Extend width to fit our longest string (or our max-width).
        for index, choice in enumerate(choices):
            if len(choices_display_fin) == len(choices):
                choice_display_name = choices_display_fin[index]
@ -185,8 +185,8 @@ class PopupMenuWindow(PopupWindow):
                    + 60,
                )

-        # init parent class - this will rescale and reposition things as
-        # needed and create our root widget
+        # Init parent class - this will rescale and reposition things as
+        # needed and create our root widget.
        super().__init__(
            position, size=(self._width, self._height), scale=self._scale
        )
@ -205,7 +205,7 @@ class PopupMenuWindow(PopupWindow):
        else:
            self._offset_widget = bui.containerwidget(
                parent=self.root_widget,
-                position=(30, 15),
+                position=(12, 12),
                size=(self._width - 40, self._height),
                background=False,
            )
@ -238,6 +238,7 @@ class PopupMenuWindow(PopupWindow):
                on_activate_call=self._activate,
                v_align='center',
                selectable=(not inactive),
+                glow_type='uniform',
            )
            if choice == self._current_choice:
                bui.containerwidget(
--- a/src/assets/ba_data/python/bauiv1lib/settings/gamepad.py
+++ b/src/assets/ba_data/python/bauiv1lib/settings/gamepad.py
@ -812,15 +812,22 @@ class GamepadSettingsWindow(bui.Window):
        from bauiv1lib.confirm import ConfirmWindow

        assert bui.app.classic is not None
-        ConfirmWindow(
-            # TODO: Implement a translation string for this!
-            'Are you sure you want to reset your button mapping?\n'
-            'This will also reset your advanced mappings\n'
-            'and secondary controller button mappings.',
-            self._do_reset,
-            width=490,
-            height=150,
-        )
+
+        # efro note: I think it's ok to reset without a confirm here
+        # because the user can see pretty clearly what changes and can
+        # cancel out of the settings window without saving if they want.
+        if bool(False):
+            ConfirmWindow(
+                # TODO: Implement a translation string for this!
+                'Are you sure you want to reset your button mapping?\n'
+                'This will also reset your advanced mappings\n'
+                'and secondary controller button mappings.',
+                self._do_reset,
+                width=490,
+                height=150,
+            )
+        else:
+            self._do_reset()

    def _do_reset(self) -> None:
        """Resets the input's mapping settings."""
--- a/src/assets/ba_data/python/bauiv1lib/settings/keyboard.py
+++ b/src/assets/ba_data/python/bauiv1lib/settings/keyboard.py
@ -305,13 +305,20 @@ class ConfigKeyboardWindow(bui.Window):
        from bauiv1lib.confirm import ConfirmWindow

        assert bui.app.classic is not None
-        ConfirmWindow(
-            # TODO: Implement a translation string for this!
-            'Are you sure you want to reset your button mapping?',
-            self._do_reset,
-            width=480,
-            height=95,
-        )
+
+        # efro note: I think it's ok to reset without a confirm here
+        # because the user can see pretty clearly what changes and can
+        # cancel out of the keyboard settings edit if they want.
+        if bool(False):
+            ConfirmWindow(
+                # TODO: Implement a translation string for this!
+                'Are you sure you want to reset your button mapping?',
+                self._do_reset,
+                width=480,
+                height=95,
+            )
+        else:
+            self._do_reset()

    def _do_reset(self) -> None:
        """Resets the input's mapping settings."""
--- a/src/ballistica/shared/ballistica.cc
+++ b/src/ballistica/shared/ballistica.cc
@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int {
 namespace ballistica {

 // These are set automatically via script; don't modify them here.
-const int kEngineBuildNumber = 21790;
+const int kEngineBuildNumber = 21793;
 const char* kEngineVersion = "1.7.33";
 const int kEngineApiVersion = 8;