Merge remote-tracking branch 'origin/main' into merge-a-bit-shared-logic

Author: Bilb

.github/workflows/check_for_crowdin_updates.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.12
           cache: 'pip' # caching pip dependencies
       - name: Install Dependencies
         shell: bash

.prettierignore

@@ -0,0 +1,2 @@
+*.yml
+

actions/checkout_desktop/action.yml

@@ -8,7 +8,7 @@ runs:
         with:
           repository: 'session-foundation/session-desktop'
           path: 'desktop'
-          ref: 'unstable'
+          ref: 'dev'
       - name: Remove existing strings
         shell: bash
         run: |

actions/setup_shared/action.yml

@@ -6,7 +6,7 @@ runs:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.12
           cache: 'pip' # caching pip dependencies
       - name: Install Dependencies
         shell: bash

crowdin/generate_desktop_strings.py

@@ -117,7 +117,7 @@ def convert_non_translatable_strings_to_type_script(input_file, output_path, exp
     # Output the file in the desired format
     Path(output_path).parent.mkdir(parents=True, exist_ok=True)
 
-    joined_exported_locales = ", ".join(f"\n  '{locale}'" for locale in exported_locales)
+    joined_exported_locales = ",".join(f"\n  '{locale}'" for locale in exported_locales)
     joined_rtl_locales = ", ".join(f"'{locale}'" for locale in rtl_locales)
 
     with open(output_path, 'w', encoding='utf-8') as file:
@@ -134,6 +134,10 @@ def convert_non_translatable_strings_to_type_script(input_file, output_path, exp
         file.write('\n')
         file.write("export type CrowdinLocale = (typeof crowdinLocales)[number];\n")
         file.write('\n')
+        file.write('export function isCrowdinLocale(locale: string): locale is CrowdinLocale {\n')
+        file.write('  return crowdinLocales.includes(locale as CrowdinLocale);\n')
+        file.write('}\n')
+        file.write('\n')
 
 
 def convert_all_files(input_directory):

do_not_commit.sh

@@ -0,0 +1,20 @@
+. venv/bin/activate
+
+rm -rf /tmp/strings_download_directory /tmp/strings_output_directory
+python crowdin/download_translations_from_crowdin.py db687d6437eb61196bdb5cf18d6b2a9c6f8bea968f2da097b9c3044198377e26ed930c4f4b31184d 618696 --glossary_id 407522 --concept_id 36 /tmp/strings_download_directory --skip-untranslated-strings
+
+python "crowdin/generate_desktop_strings.py" "/tmp/strings_download_directory" "/tmp/strings_output_directory/_locales" "/tmp/strings_output_directory/desktop/ts/localization/constants.ts" && nautilus /tmp/strings_output_directory/_locales /tmp/strings_output_directory/desktop/ts/localization/
+
+
+python "crowdin/generate_android_strings.py" "/tmp/strings_download_directory" "/tmp/strings_output_directory/android/plop" "/tmp/strings_output_directory/android/plop.kt"
+
+gh workflow run check_for_crowdin_updates.yml
+
+
+https://crowdin.com/editor/session-crossplatform-strings/all?view=multilingual&languages=he,ha,hi,hu,id,ja,it,kn,km,ko,ku,kmr,lo,lt,lv,lg,mk,ms,mn,no,nenp,nb,nnno,ps,fa,pl,pt,ptbr,pain,ro&filter=basic&value=39
+
+https://crowdin.com/editor/session-crossplatform-strings/all?view=multilingual&languages=ro,ru,sr,srcs,sh,silk,sk,sl,es,sw,es419,sv,tl,ta,te,th,uk,tr,urin,uz,vi,cy,xh&filter=basic&value=39
+
+https://crowdin.com/editor/session-crossplatform-strings/all?view=multilingual&languages=fr,af,ar,be,bg,ca,cs,da,de,el,eu,fi,hy,ka,nl,sq,zhcn,zhtw,gl,bn,hr,et,az,my,eo,fil,lg,ha,bal,ny&filter=basic&value=39
+
+