Skip to content
This repository was archived by the owner on May 6, 2024. It is now read-only.

Commit 5b3043d

Browse files
authored
build: Release 4.1.0
Merge pull request #1809 from openedx/rc/4.1.0
2 parents c41f9c2 + a9b59b8 commit 5b3043d

File tree

11 files changed

+43
-9
lines changed

11 files changed

+43
-9
lines changed

OpenEdXMobile/AndroidManifest.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,14 @@
5050
<application
5151
android:name=".base.RuntimeApplication"
5252
android:allowBackup="true"
53+
android:enableOnBackInvokedCallback="true"
5354
android:icon="@mipmap/ic_launcher"
5455
android:label="@string/app_name"
5556
tools:replace="android:supportsRtl"
5657
android:supportsRtl="${supportsRtl}"
5758
android:networkSecurityConfig="@xml/network_security_config"
5859
android:theme="@style/AppTheme"
59-
tools:targetApi="n">
60+
tools:targetApi="tiramisu">
6061

6162
<activity
6263
android:name="org.edx.mobile.view.SplashActivity"

OpenEdXMobile/proguard-rules.pro

+6
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,9 @@
3131

3232
# Keep Rule to hide the original source file name on stack trace
3333
-renamesourcefileattribute SourceFile
34+
35+
# Rules enforced by Android Gradle plugin.
36+
-dontwarn com.google.crypto.**
37+
-dontwarn com.google.protobuf.**
38+
-dontwarn com.huawei.hms.ads.**
39+
-dontwarn edu.umd.cs.findbugs.**

OpenEdXMobile/res/values-es/iap_strings.xml

+3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
<string name="error_course_not_fullfilled">Algo sucedió cuando intentamos actualizar su experiencia en el curso. Si este error continúa, comuníquese con Soporte para obtener ayuda.</string>
3535
<!-- The price wasn't fetched from the payment sdk -->
3636
<string name="error_price_not_fetched">Su solicitud no se pudo completar en este momento. Si este error continúa, comuníquese con Soporte.</string>
37+
<!-- The course is upgraded and verified -->
38+
<string name="error_course_paid_and_verified">El curso que desea actualizar ya ha sido pagado. Para obtener ayuda adicional, comuníquese con Soporte.</string>
39+
3740

3841
<!-- Full Screen Loader -->
3942
<string name="fullscreen_loader_unlocking">Desbloqueo</string>

OpenEdXMobile/res/values-fr/iap_strings.xml

+3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
<string name="error_course_not_fullfilled">Quelque chose s’est produit lorsque nous avons essayé de mettre à jour votre expérience de cours. Si cette erreur persiste, contactez le support pour obtenir de l’aide.</string>
3535
<!-- The price wasn't fetched from the payment sdk -->
3636
<string name="error_price_not_fetched">Votre demande n’a pas pu être traitée pour le moment. Si cette erreur persiste, veuillez contacter le support</string>
37+
<!-- The course is upgraded and verified -->
38+
<string name="error_course_paid_and_verified">Le cours que vous cherchez à mettre à niveau a déjà été payé. Pour obtenir plus d\'aide, merci de contacter le support.</string>
39+
3740

3841
<!-- Full Screen Loader -->
3942
<string name="fullscreen_loader_unlocking">Déverrouillage</string>

OpenEdXMobile/res/values-iw/iap_strings.xml

+3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
<string name="error_course_not_fullfilled">משהו קרה כשניסינו לעדכן את חוויית הקורס שלך. אם השגיאה הזאת נמשכת, נא לפנות לתמיכה לעזרה.</string>
3535
<!-- The price wasn't fetched from the payment sdk -->
3636
<string name="error_price_not_fetched">לא ניתן להשלים את הבקשה שלך כרגע. אם השגיאה הזאת נמשכת, נא לפנות לתמיכה.</string>
37+
<!-- The course is upgraded and verified -->
38+
<string name="error_course_paid_and_verified">הקורס שברצונך לשדרג כבר שולם. לעזרה נוספת, נא לגשת לתמיכה.</string>
39+
3740

3841
<!-- Full Screen Loader -->
3942
<string name="fullscreen_loader_unlocking">הגישה המלאה</string>

OpenEdXMobile/res/values-pt-rBR/iap_strings.xml

+3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
<string name="error_course_not_fullfilled">Algo aconteceu quando tentamos atualizar sua experiência no curso. Se o erro persistir, entre em contato com o Suporte para obter ajuda.</string>
3535
<!-- The price wasn't fetched from the payment sdk -->
3636
<string name="error_price_not_fetched">Sua solicitação não pode ser concluída neste momento. Se o erro persistir, entre em contato com o Suporte.</string>
37+
<!-- The course is upgraded and verified -->
38+
<string name="error_course_paid_and_verified">O curso que você deseja atualizar já foi pago. Para obter ajuda adicional, entre em contato com o Suporte.</string>
39+
3740

3841
<!-- Full Screen Loader -->
3942
<string name="fullscreen_loader_unlocking">Desbloqueando</string>

OpenEdXMobile/res/values-tr/course_dates_strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<!-- Title course calendar is out-of-date -->
4444
<string name="title_calendar_out_of_date">Ders takviminiz güncel değil</string>
4545
<!-- Message course calendar is out-of-date -->
46-
<string name="message_calendar_out_of_date">Ders tarihleriniz değiştirildi ve ders takviminiz artık yeni programınızla güncel değil.</string>
46+
<string name="message_calendar_out_of_date">Ders tarihleriniz değiştirildi ve ders takviminiz artık yeni programınızla uyumlu değil.</string>
4747
<!-- Error message while creating calendar for the course events -->
4848
<string name="adding_calendar_error_message">Takvim Eklenirken Hata, Lütfen daha sonra tekrar deneyin</string>
4949
<!-- Alert dialog remove course calendar button -->

OpenEdXMobile/res/values-tr/iap_strings.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,12 @@
3434
<string name="error_course_not_fullfilled">Ders deneyiminizi güncellemeye çalıştığımızda bir şey oldu. Bu hata devam ederse, yardım için Destek ile iletişime geçin.</string>
3535
<!-- The price wasn't fetched from the payment sdk -->
3636
<string name="error_price_not_fetched">İsteğiniz şu anda tamamlanamadı. Bu hata devam ederse, lütfen Destek ile iletişime geçin.</string>
37+
<!-- The course is upgraded and verified -->
38+
<string name="error_course_paid_and_verified">Yükseltmek istediğiniz dersin ödemesi zaten yapıldı. Ek yardım için Destek ile iletişime geçin.</string>
39+
3740

3841
<!-- Full Screen Loader -->
39-
<string name="fullscreen_loader_unlocking">Kilidini açma</string>
42+
<string name="fullscreen_loader_unlocking">Kilit açılıyor</string>
4043
<string name="fullscreen_loader_full_access">tam erişim</string>
4144
<string name="fullscreen_loader_to_your_course">dersinize</string>
4245

OpenEdXMobile/res/values-tr/strings.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,15 @@
8585
<!--Button text to show user current downloads screen-->
8686
<string name="label_current_downloads">Şu anki indirmeleri görüntüle</string>
8787
<!--Title of user's course list screen-->
88-
<string name="label_my_courses">Derslerim</string>
88+
<string name="label_my_courses">Dersler</string>
8989
<!--Title of user's program list screen-->
9090
<string name="label_my_programs">Programlar</string>
9191
<!--Title of native Find Courses Screen-->
9292
<string name="label_find_courses">Dersleri Bul</string>
9393
<!--Title of Find Courses tab on Main Dashboard screen-->
9494
<string name="label_discovery">Keşfet</string>
9595
<!--Button allowing users to send an email for feedback-->
96-
<string name="label_submit_feedback">Geribildirim Gönder</string>
96+
<string name="label_submit_feedback">Geribildirim gönder</string>
9797
<!--Toggle switch on state label-->
9898
<string name="toggle_turn_on">Açık</string>
9999
<!--Toggle switch off state label-->
@@ -239,7 +239,7 @@
239239
<!--Used while constructing the author attribution text for a discussion post e.g. "3 days ago by Brian (Staff)"-->
240240
<string name="discussion_post_author_attribution">{author} tarafından</string>
241241
<!--Used while constructing the author attribution text for an answer response e.g. "Marked as answer 2 days ago by Khalid (Community TA)"-->
242-
<string name="discussion_post_marked_as_answer">Çözüm olarak işaretlendi.</string>
242+
<string name="discussion_post_marked_as_answer">Çözüm olarak işaretlendi</string>
243243
<!--Used while constructing the author attribution text for an endorsed response e.g. "Endorsed 2 days ago by Khalid"-->
244244
<string name="discussion_post_endorsed">En İyi Cevap Olarak Seçildi</string>
245245
<!--Used for putting authorLabel into parenthesis e.g. (Community TA) or (Staff)-->
@@ -310,9 +310,9 @@
310310
<!--Label for selected topic when creating a post-->
311311
<string name="discussion_add_post_topic_selection">Konu: {topic}</string>
312312
<!--Add post button title in adding a new discussion-->
313-
<string name="discussion_add_post_button_label">Tartışma gönder</string>
313+
<string name="discussion_add_post_button_label">Tartışmaya ileti gönder</string>
314314
<!--Add post button description for accessibility in adding a new discussion-->
315-
<string name="discussion_add_post_button_description">Tartışma gönder düğmesi</string>
315+
<string name="discussion_add_post_button_description">Tartışmaya ileti gönder düğmesi</string>
316316
<!--Add post button title in adding a new post-->
317317
<string name="discussion_add_question_button_label">Soru gönder</string>
318318
<!--Add post button content description for accessibility in adding a new post-->
@@ -391,7 +391,7 @@
391391
<item quantity="other">{total_videos_count} Video, toplam {total_videos_size}</item>
392392
</plurals>
393393
<!--Title for bulk videos download view when download is starting-->
394-
<string name="download_starting">İndirilme Başlıyor...</string>
394+
<string name="download_starting">İndirme Başlıyor...</string>
395395
<!--Title for bulk videos download view when in downloading state-->
396396
<string name="downloading_videos">Videolar İndiriliyor...</string>
397397
<!--Subtitle for bulk videos download view when in downloading state-->
+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<!-- Use this file to add new general strings and stop adding/editing strings in the older file strings.xml
4+
Create a new strings file like strings_3.xml file when the strings count reaches 100 -->
5+
6+
<resources>
7+
<!-- Dialog Alert title for Open in browser -->
8+
<string name="label_leaving_the_app">Uygulamadan çıkılıyor</string>
9+
<!-- Dialog Alert Message for Open in browser -->
10+
<string name="leaving_the_app_message">{platform_name} uygulamasından çıkıyor ve tarayıcıya geçiyorsunuz.</string>
11+
</resources>

gradle.properties

+1
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ android.enableJetifier=true
1515
android.useAndroidX=true
1616
org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
1717
android.nonFinalResIds=false
18+
android.enableR8.fullMode=false

0 commit comments

Comments
 (0)