Merge branch 'develop' into compose-weekview

SapuSeven · Nov 15, 2023 · 2993d0b · 2993d0b
2 parents 1396659 + 935d55e
commit 2993d0b
Show file tree

Hide file tree

Showing 6 changed files with 351 additions and 13 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,6 +2,7 @@ version: 2.1
 orbs:
   gh: circleci/[email protected]
   jq: circleci/[email protected]
+  android: circleci/[email protected]
 filters: &release
   branches:
     ignore: /.*/
@@ -10,20 +11,16 @@ filters: &release
 jobs:
   build:
     working_directory: ~/betteruntis
-    docker:
-      - image: cimg/android:2023.06.1
-    resource_class: large
+    executor:
+      name: android/android-machine
+      resource-class: large
+      tag: 2023.10.1
     steps:
       - checkout
-      - restore_cache:
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
+      - android/restore-gradle-cache
       - run:
           name: Download Dependencies
           command: ./gradlew androidDependencies
-      - save_cache:
-          paths:
-            - ~/.gradle
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
       - run:
           name: Prepare signing config
           command: |
@@ -34,14 +31,15 @@ jobs:
             echo 'export KEY_RELEASE_PASSWORD=$(echo "$KEY_RELEASE_PASSWORD_ENCODED" | base64 --decode)' >> $BASH_ENV
       - run:
           name: Initial build
-          command: ./gradlew --no-daemon assemble bundle
+          command: ./gradlew --no-configuration-cache --no-daemon assemble bundle
           environment:
             GRADLE_OPTS: '
               -Dorg.gradle.daemon=false
               -Dorg.gradle.parallel=true
               -Dorg.gradle.workers.max=3
               -Dkotlin.incremental=false
             '
+      - android/save-gradle-cache
       - store_artifacts:
           name: Upload build artifacts
           path: app/build/outputs
@@ -163,6 +161,7 @@ jobs:
             git config user.name "CircleCI"
             
             git checkout -B release
+            git reset --hard HEAD~1
             git merge $CIRCLE_TAG
             
             versionCode=$(jq '.elements[0].versionCode' ./workspace/outputs/apk/gms/release/output-metadata.json)
@@ -171,7 +170,7 @@ jobs:
             git add ./app/build.gradle
             git commit -m "[skip ci] Update F-Droid release"
             git tag fdroid-$CIRCLE_TAG
-            git push --set-upstream origin release
+            git push --force --set-upstream origin release
             git push origin fdroid-$CIRCLE_TAG
 workflows:
   version: 2

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -45,7 +45,7 @@
     <string name="menu_infocenter_events">Termine</string>
     <string name="menu_infocenter_absences">Abwesenheiten</string>
     <string name="mainactivitydrawer_dropdown_show">Alle Profile anzeigen</string>
-    <string name="mainactivitydrawer_profile_add">Profil hinzufügen</string>
+    <string name="mainactivitydrawer_profile_add">Ein Profil hinzufügen</string>
     <string name="mainactivitydrawer_profile_delete_hint">Lange auf ein Profil tippen, um zu bearbeiten</string>
     <string name="main_dialog_delete_profile_title">Profil löschen?</string>
     <string name="main_dialog_delete_profile_message">Bist du sicher, dass du dein Profil mit dem Benutzer %1$s an der Schule %2$s löschen möchtest\?</string>

diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
@@ -375,4 +375,6 @@
     <string name="main_dialog_reports_info_1">BetterUntis koristi Sentry za prikupljanje informacija o prekidima rada programa i o drugim greškama.</string>
     <string name="elementpicker_timetable_select">Odaberi raspored sati</string>
     <string name="all_personal_abbr">Osobno</string>
+    <string name="preference_category_app_language">Jezik aplikacije</string>
+    <string name="preference_app_language">Jezik aplikacije</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="all_dialog_error_message">Aanvraag ID: %1$d
+\nFoutcode: %2$d
+\nFoutbericht: %3$s</string>
+    <string name="elementpicker_hint_search_teachers">Zoeken naar leraren…</string>
+    <string name="all_error_details">Foutmelding: %1$s</string>
+    <string name="infocenter_absences_filter_sort">Sorteer volgorde</string>
+    <string name="all_yes">Ja</string>
+    <string name="all_hint_tap_to_edit">(Tikken om te bewerken)</string>
+    <string name="all_lesson_exam">%1$s (examen!)</string>
+    <string name="all_success">succes</string>
+    <string name="all_dialog_crash_title">Crashlog gevonden</string>
+    <string name="errors_github_attach_file_message">Voeg de gecomprimeerde logbestanden bij dit probleem.
+\nZe zijn opgeslagen op`%1$s`</string>
+    <string name="errormessagedictionary_invalid_time_settings">Ongeldige datum- en/of tijdinstellingen!</string>
+    <string name="elementpicker_hint_search_rooms">Zoek naar lokalen…</string>
+    <string name="activity_title_errors">Foutmeldingen</string>
+    <string name="all_dialog_datepicker_button_today">Vandaag</string>
+    <string name="all_classes">Klassen</string>
+    <string name="all_no">Nee</string>
+    <string name="all_lessontopic">Lesonderwerp</string>
+    <string name="infocenter_officehours_empty">Geen kantooruren</string>
+    <string name="all_lessontopic_none">(Geen onderwerp)</string>
+    <string name="all_edit">Bewerk</string>
+    <string name="infocenter_absence_excused">Gexcuseerd</string>
+    <string name="all_dialog_error_title">Foutinformatie</string>
+    <string name="errors_button_report">Alles melden</string>
+    <string name="elementpicker_hint_search">Zoeken…</string>
+    <string name="errormessagedictionary_server_webuntis_not_installed">De opgegeven server heeft WebUntis niet geïnstalleerd!</string>
+    <string name="all_error">Fout</string>
+    <string name="infocenter_absences_filter">Filter afwezigheden</string>
+    <string name="all_lesson_info">Info</string>
+    <string name="errors_report">Help de app te verbeteren door de foutmeldingen hieronder te melden:</string>
+    <string name="errormessagedictionary_invalid_credentials">Verkeerde gebruikersnaam of sleutel!</string>
+    <string name="elementpicker_timetable_select">Selecteer een tijdschema</string>
+    <string name="all_close">Sluiten</string>
+    <string name="all_reset">Reset</string>
+    <string name="infocenter_absences_filter_newest_first">Nieuwste eerst</string>
+    <string name="all_lessontopic_edit">Lesonderwerp bewerken</string>
+    <string name="infocenter_timeformat">%2$s, %1$s - %4$s, %3$s</string>
+    <string name="all_lesson_details">Lesdetails</string>
+    <string name="infocenter_events_empty">Geen gebeurtenissen</string>
+    <string name="all_failed">mislukt</string>
+    <string name="infocenter_absence_unknown_reason">Onbekende reden</string>
+    <string name="infocenter_messages_attachments">Bijlagen</string>
+    <string name="errors_crash_message">Sorry daarvoor.</string>
+    <string name="all_personal_timetable">Persoonlijk rooster</string>
+    <string name="all_personal">Persoonlijk</string>
+    <string name="errormessagedictionary_too_many_results">Te veel resultaten</string>
+    <string name="all_dialog_absences_checked">Afwezigheden gecontroleerd.</string>
+    <string name="infocenter_events_exam_name_long">%1$s - %2$s</string>
+    <string name="errormessagedictionary_generic">Onbekende fout</string>
+    <string name="errormessagedictionary_no_public_access">Anonieme toegang is uitgeschakeld.</string>
+    <string name="all_anonymous">Anoniem</string>
+    <string name="all_lesson_cancelled">%1$s (geannuleerd)</string>
+    <string name="errors_crash_title">Het lijkt erop dat BetterUntis is gecrasht.</string>
+    <string name="infocenter_messages_empty">Geen berichten</string>
+    <string name="all_lesson_irregular">%1$s (onregelmatig)</string>
+    <string name="all_back">Terug</string>
+    <string name="all_dialog_absences_not_checked">Afwezigheden niet gecontroleerd.</string>
+    <string name="all_delete">Verwijder</string>
+    <string name="infocenter_absences_empty">Geen afwezigheden</string>
+    <string name="all_add">Toevoegen</string>
+    <string name="activity_title_settings">Instellingen</string>
+    <string name="infocenter_timeformat_sameday">%2$s - %4$s, %1$s</string>
+    <string name="errormessagedictionary_invalid_school">De opgegeven school bestaat niet!</string>
+    <string name="all_rooms">Lokalen</string>
+    <string name="activity_title_info_center">Info Center</string>
+    <string name="errors_button_dismiss">Alles afwijzen</string>
+    <string name="all_exam">Examen</string>
+    <string name="errormessagedictionary_user_locked">Gebruiker vergrendeld!</string>
+    <string name="all_subjects">Onderwerpen</string>
+    <string name="infocenter_absences_filter_oldest_first">Oudste eerst</string>
+    <string name="elementpicker_hint_search_classes">Zoek naar klassen…</string>
+    <string name="all_absences">Afwezigheden</string>
+    <string name="all_homework">Huiswerk</string>
+    <string name="errormessagedictionary_invalid_server_url">Ongeldige server URL!</string>
+</resources>