From 063729096a6888e6b366fd808c0a79f97e0f5b66 Mon Sep 17 00:00:00 2001 From: pml68 Date: Wed, 28 Feb 2024 22:41:29 +0100 Subject: [PATCH 1/3] fix: teacher rename section had no german translation --- .../lib/screens/settings/modify_names.i18n.dart | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/refilc_mobile_ui/lib/screens/settings/modify_names.i18n.dart b/refilc_mobile_ui/lib/screens/settings/modify_names.i18n.dart index 8c10d88..00304ac 100644 --- a/refilc_mobile_ui/lib/screens/settings/modify_names.i18n.dart +++ b/refilc_mobile_ui/lib/screens/settings/modify_names.i18n.dart @@ -56,12 +56,12 @@ extension SettingsLocalization on String { "rename_new_subject": "Neues Fach umbenennen", "italics_toggle": "Kursivschrift umschalten", // teacher rename - "renamed_teachers": "Renamed Teachers", - "rename_teachers": "Rename Teachers", - "rename_teacher": "Rename Teacher", - "select_teacher": "Select Teacher", - "modify_teachers": "Modify Teachers", - "rename_new_teacher": "Rename New Teacher", + "renamed_teachers": "Umbenannte Lehrer", + "rename_teachers": "Lehrer umbenennen", + "rename_teacher": "Lehrer umbenennen", + "select_teacher": "Lehrer auswählen", + "modify_teachers": "Lehrer ändern", + "rename_new_teacher": "Neuen Lehrer umbenennen", }, }; From cc4c3851fb204644ff6ecca3674c348583f38c65 Mon Sep 17 00:00:00 2001 From: pml68 Date: Wed, 28 Feb 2024 23:15:42 +0100 Subject: [PATCH 2/3] fix: german translations for abscences page --- .../lib/pages/absences/absences_page.i18n.dart | 12 ++++++------ .../lib/pages/absences/absences_page.i18n.dart | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/refilc_desktop_ui/lib/pages/absences/absences_page.i18n.dart b/refilc_desktop_ui/lib/pages/absences/absences_page.i18n.dart index 599b007..e5f4031 100644 --- a/refilc_desktop_ui/lib/pages/absences/absences_page.i18n.dart +++ b/refilc_desktop_ui/lib/pages/absences/absences_page.i18n.dart @@ -7,8 +7,8 @@ extension ScreensLocalization on String { "Absences": "Absences", "Delays": "Delays", "Misses": "Misses", - "emptyDelays": "You have no absences.", - "emptyMisses": "You have no absences.", + "emptyDelays": "You have no delays.", + "emptyMisses": "You have no missing homeworks or equipments.", "stat_1": "Excused Absences", "stat_2": "Unexcused Absences", "stat_3": "Excused Delay", @@ -23,8 +23,8 @@ extension ScreensLocalization on String { "Absences": "Hiányzások", "Delays": "Késések", "Misses": "Hiányok", - "emptyDelays": "Nincsenek hiányzásaid.", - "emptyMisses": "Nincsenek hiányaid.", + "emptyDelays": "Nincsenek késéseid.", + "emptyMisses": "Nincsenek hiányzó házi feladataid, felszereléseid.", "stat_1": "Igazolt hiányzások", "stat_2": "Igazolatlan hiányzások", "stat_3": "Igazolt Késés", @@ -39,8 +39,8 @@ extension ScreensLocalization on String { "Absences": "Fehlen", "Delays": "Verspätung", "Misses": "Fehlt", - "emptyDelays": "Sie haben keine Fehlen.", - "emptyMisses": "Sie haben keine Fehlen.", + "emptyDelays": "Sie haben keine Abwesenheiten.", + "emptyMisses": "Sie haben noch keine fehlende Hausaufgaben oder Austattung.", "stat_1": "Entschuldigte Fehlen", "stat_2": "Unentschuldigte Fehlen", "stat_3": "Entschuldigte Verspätung", diff --git a/refilc_mobile_ui/lib/pages/absences/absences_page.i18n.dart b/refilc_mobile_ui/lib/pages/absences/absences_page.i18n.dart index 97d931a..afae67b 100644 --- a/refilc_mobile_ui/lib/pages/absences/absences_page.i18n.dart +++ b/refilc_mobile_ui/lib/pages/absences/absences_page.i18n.dart @@ -7,8 +7,8 @@ extension ScreensLocalization on String { "Absences": "Absences", "Delays": "Delays", "Misses": "Misses", - "emptyDelays": "You have no absences.", - "emptyMisses": "You have no absences.", + "emptyDelays": "You have no delays.", + "emptyMisses": "You have no missing homeworks or equipments.", "stat_1": "Excused Absences", "stat_2": "Unexcused Absences", "stat_3": "Excused Delay", @@ -24,8 +24,8 @@ extension ScreensLocalization on String { "Absences": "Hiányzások", "Delays": "Késések", "Misses": "Hiányok", - "emptyDelays": "Nincsenek hiányzásaid.", - "emptyMisses": "Nincsenek hiányaid.", + "emptyDelays": "Nincsenek késéseid.", + "emptyMisses": "Nincsenek hiányzó házi feladataid, felszereléseid.", "stat_1": "Igazolt hiányzások", "stat_2": "Igazolatlan hiányzások", "stat_3": "Igazolt Késés", @@ -41,8 +41,8 @@ extension ScreensLocalization on String { "Absences": "Fehlen", "Delays": "Verspätung", "Misses": "Fehlt", - "emptyDelays": "Sie haben keine Fehlen.", - "emptyMisses": "Sie haben keine Fehlen.", + "emptyDelays": "Sie haben keine Abwesenheiten.", + "emptyMisses": "Sie haben noch keine fehlende Hausaufgaben oder Austattung.", "stat_1": "Entschuldigte Fehlen", "stat_2": "Unentschuldigte Fehlen", "stat_3": "Entschuldigte Verspätung", From 299f037cce578925d9ce530cf5f081c2d0063a0a Mon Sep 17 00:00:00 2001 From: pml68 Date: Wed, 28 Feb 2024 23:36:32 +0100 Subject: [PATCH 3/3] feat: update workflows to use refilc instead of filcnaplo --- .github/workflows/android.yml | 10 +++++----- .github/workflows/ios.yml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 5316cb2..5927722 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -15,10 +15,10 @@ jobs: encodedString: ${{ secrets.KEYSTORE_BASE64 }} - name: Create key.properties run: | - echo "storeFile=${{ steps.android_keystore.outputs.filePath }}" > filcnaplo/android/key.properties - echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> filcnaplo/android/key.properties - echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> filcnaplo/android/key.properties - echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> filcnaplo/android/key.properties + echo "storeFile=${{ steps.android_keystore.outputs.filePath }}" > refilc/android/key.properties + echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> refilc/android/key.properties + echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> refilc/android/key.properties + echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> refilc/android/key.properties - uses: actions/setup-java@v3 with: distribution: "zulu" @@ -32,7 +32,7 @@ jobs: - name: Install dependencies run: ./fix-pub.sh - name: Build - run: cd filcnaplo && ./build.sh + run: cd refilc && ./build.sh - name: Upload Android Release uses: actions/upload-artifact@v2 with: diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 604d8ea..c456926 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -46,7 +46,7 @@ jobs: # Build and sign the ipa using a single flutter command - name: Building IPA - working-directory: filcnaplo + working-directory: refilc run: bash build-ipa.sh # Collect the file and upload as artifact @@ -55,7 +55,7 @@ jobs: with: name: release-ipa # Path to the release files - path: filcnaplo/build/ios/ipa/*.ipa + path: refilc/build/ios/ipa/*.ipa # Important! Cleanup: remove the certificate and provisioning profile from the runner! - name: Clean up keychain and provisioning profile