Skip to content

Commit

Permalink
actions: more content labeling (fixes #3189) (#3190)
Browse files Browse the repository at this point in the history
Co-authored-by: dogi <[email protected]>
  • Loading branch information
Okuro3499 and dogi authored Mar 6, 2024
1 parent c4801a1 commit 43e570e
Show file tree
Hide file tree
Showing 14 changed files with 34 additions and 21 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ android {
applicationId "org.ole.planet.myplanet"
minSdkVersion 21
targetSdkVersion 34
versionCode 1390
versionName "0.13.90"
versionCode 1391
versionName "0.13.91"
ndkVersion '21.3.6528147'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_login.xml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
android:layout_centerVertical="true"
android:autofillHints=""
android:drawablePadding="12dp"
android:hint="password"
android:hint="@string/password"
android:inputType="textPassword"
android:paddingStart="10dp"
android:paddingEnd="8dp"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/app_bar_bell.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@
app:tint="@color/md_white_1000" />

</LinearLayout>
</androidx.appcompat.widget.Toolbar>
</androidx.appcompat.widget.Toolbar>
4 changes: 3 additions & 1 deletion app/src/main/res/layout/fragment_chat_detail.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:contentDescription="@string/recycler_chat_label"
android:layout_marginBottom="16dp"
app:layout_constrainedHeight="true"
app:layout_constraintBottom_toTopOf="@+id/text_gchat_indicator"
Expand Down Expand Up @@ -85,7 +86,8 @@
android:layout_alignParentEnd="true"
android:layout_margin="5dp"
android:background="?attr/selectableItemBackground"
android:src="@drawable/send_icon" />
android:src="@drawable/send_icon"
android:contentDescription="@string/submit" />

</RelativeLayout>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/fragment_feedback_list.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/padding_large"
android:src="@drawable/ic_add" />
android:src="@drawable/ic_add"
android:contentDescription="@string/add" />

</FrameLayout>
3 changes: 2 additions & 1 deletion app/src/main/res/layout/fragment_notification.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
android:layout_height="@dimen/_40dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_left_arrow"
app:tint="@color/md_black_1000" />
app:tint="@color/md_black_1000"
android:contentDescription="@string/btn_back" />


<TextView
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/fragment_team.xml
Original file line number Diff line number Diff line change
Expand Up @@ -103,5 +103,6 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:padding="@dimen/padding_normal"
app:srcCompat="@drawable/ic_add" />
app:srcCompat="@drawable/ic_add"
android:contentDescription="@string/add" />
</FrameLayout>
2 changes: 2 additions & 0 deletions app/src/main/res/layout/item_team_list.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="Request To join"
android:contentDescription="@string/join"
android:textSize="10sp"
app:layout_constraintEnd_toStartOf="@id/edit_team"
app:layout_constraintHorizontal_chainStyle="packed"
Expand All @@ -81,6 +82,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/menu_feedback"
android:contentDescription="@string/menu_feedback"
android:textSize="10sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_weight="1"
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<string name="err_msg_name">الرجاء إدخال اسم المستخدم</string>
<string name="err_msg_password">الرجاء إدخال كلمة المرور</string>
<string name="err_msg_login">اسم المستخدم و/أو كلمة المرور غير متطابقة</string>
<string name="hint_serverURl">عنوان خادم الكوكب (مثال: 192.168.2.1)</string>
<string name="hint_serverPin">رقم التعريف الشخصي للخادم (احصل على هذا الرقم من المسؤول)</string>
<string name="hint_serverURl">عنوان ip للكوكب (مثلاً 192.168.2.1)</string>
<string name="hint_serverPin">رمز pin للخادم (احصل عليه من المسؤول)</string>
<string name="radio_protocol">البروتوكول:</string>
<string name="radio_http">http</string>
<string name="radio_https">https</string>
Expand Down Expand Up @@ -957,5 +957,6 @@
<string name="invalid_configuration">تكوينات الخادم غير صالحة</string>
<string name="date_reset">إعادة ضبط التاريخ</string>
<string name="no_course_matched_filter">لا توجد دورات تطابق الفلتر</string>
<string name="recycler_chat_label">محادثات</string>

</resources>
5 changes: 3 additions & 2 deletions app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<string name="err_msg_name">Ingresa tu nombre de usuario</string>
<string name="err_msg_password">Ingresa la contraseña</string>
<string name="err_msg_login">El nombre de usuario y/o la contraseña no coinciden</string>
<string name="hint_serverURl">Dirección del servidor del planeta (por ejemplo, 192.168.2.1)</string>
<string name="hint_serverPin">PIN del servidor (Obtén este PIN del administrador)</string>
<string name="hint_serverURl">ip del planeta (ej. 192.168.2.1)</string>
<string name="hint_serverPin">pin del servidor (obtenerlo del administrador)</string>
<string name="radio_protocol">Protocolo:</string>
<string name="radio_http">http</string>
<string name="radio_https">https</string>
Expand Down Expand Up @@ -962,5 +962,6 @@
<string name="invalid_configuration">Configuraciones de servidor no válidas</string>
<string name="date_reset">Restablecer fecha</string>
<string name="no_course_matched_filter">Ningún curso coincide con el filtro</string>
<string name="recycler_chat_label">conversaciones</string>

</resources>
5 changes: 3 additions & 2 deletions app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<string name="err_msg_name">Entrez votre nom d\'utilisateur</string>
<string name="err_msg_password">Entrez le mot de passe</string>
<string name="err_msg_login">Le nom d\'utilisateur et/ou le mot de passe ne correspondent pas</string>
<string name="hint_serverURl">Adresse du serveur de la planète (Ex. 192.168.2.1)</string>
<string name="hint_serverPin">Code PIN du serveur (Obtenez ce code PIN auprès de l\'administrateur)</string>
<string name="hint_serverURl">ip de la planète (par exemple 192.168.2.1)</string>
<string name="hint_serverPin">code pin du serveur (obtenez-le de l\'administrateur)</string>
<string name="radio_protocol">Protocole :</string>
<string name="radio_http">http</string>
<string name="radio_https">https</string>
Expand Down Expand Up @@ -962,5 +962,6 @@
<string name="invalid_configuration">Configurations de serveur invalides</string>
<string name="date_reset">Réinitialisation des dates</string>
<string name="no_course_matched_filter">Aucun cours ne correspond au filtre</string>
<string name="recycler_chat_label">conversations</string>

</resources>
5 changes: 3 additions & 2 deletions app/src/main/res/values-ne/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<string name="err_msg_name">तपाईंको प्रयोगकर्तानाम लेख्नुहोस्</string>
<string name="err_msg_password">पासवर्ड लेख्नुहोस्</string>
<string name="err_msg_login">प्रयोगकर्तानाम र/वा पासवर्ड मेल खान्छैन</string>
<string name="hint_serverURl">ग्रह सर्भर ठेगाना (उदाहरणका लागि १९२.१६८..१)</string>
<string name="hint_serverPin">सर्भर पिन (प्रशासकबाट यस पिन प्राप्त गर्नुहोस्)</string>
<string name="hint_serverURl">प्लानेट आइपी (उदाहरणका लागि १९२.१६८..१)</string>
<string name="hint_serverPin">सर्भर पिन (प्रशासकबाट प्राप्त गर्नुहोस्)</string>
<string name="radio_protocol">प्रोटोकल:</string>
<string name="radio_http">http</string>
<string name="radio_https">https</string>
Expand Down Expand Up @@ -962,5 +962,6 @@
<string name="invalid_configuration">अमान्य सर्भर विन्यास</string>
<string name="date_reset">मिति रिसेट</string>
<string name="no_course_matched_filter">कुनै पनि पाठ्यक्रम मेल खाँदैन</string>
<string name="recycler_chat_label">चर्चाहरू</string>

</resources>
5 changes: 3 additions & 2 deletions app/src/main/res/values-so/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<string name="err_msg_name">Geli magaca isticmaalaha</string>
<string name="err_msg_password">Geli erayga sirta ah</string>
<string name="err_msg_login">Magaca isticmaalaha iyo/ama erayga sirta ah isma dhigmaan</string>
<string name="hint_serverURl">Cinwaanka Server-ka meeraha (Tusaale 192.168.2.1) </string>
<string name="hint_serverPin">Biinanka server-ka (Ka hel biinka maamulaha) </string>
<string name="hint_serverURl">planet ip (tusaale 192.168.2.1)</string>
<string name="hint_serverPin">pin server (ka hel admin)</string>
<string name="radio_protocol">Protocol:</string>
<string name="radio_http">http</string>
<string name="radio_https">https</string>
Expand Down Expand Up @@ -951,5 +951,6 @@
<string name="invalid_configuration">Dhamaan Suurtagal ah oo Serveryaasha ah</string>
<string name="date_reset">Dib u habeynta taariikhda</string>
<string name="no_course_matched_filter">Ma jiro koorsooyin u dhigma filtarrada</string>
<string name="recycler_chat_label">dhaqameed</string>

</resources>
7 changes: 4 additions & 3 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<string name="err_msg_name">Enter your username</string>
<string name="err_msg_password">Enter the password</string>
<string name="err_msg_login">Username and/or password do not match</string>
<string name="hint_serverURl">planet server address (eg. 192.168.2.1)</string>
<string name="hint_serverPin">server pin (get this pin from administrator)</string>
<string name="hint_serverURl">planet ip (eg. 192.168.2.1)</string>
<string name="hint_serverPin">server pin (obtain from admin)</string>
<string name="radio_protocol">Protocol:</string>
<string name="radio_http">http</string>
<string name="radio_https">https</string>
Expand Down Expand Up @@ -558,7 +558,7 @@
<string name="add_label">Add Label</string>
<string name="share_with_community">Share with community</string>
<string name="add_res">Add Resource</string>
<string name="password">Password</string>
<string name="password">password</string>
<string name="retype_password">Confirm Password</string>
<string name="become_a_member">Become a member</string>
<string name="change_member">Change Member</string>
Expand Down Expand Up @@ -1066,5 +1066,6 @@
<string name="ob_desc4_3">🎯 Personalized: Tailor your learning path.</string>
<string name="ob_desc4_4">📚 Interactive: Engage with videos, books, games.</string>
<string name="ob_desc4_5">Begin your limitless learning journey with myPlanet!</string>
<string name="recycler_chat_label">conversations</string>

</resources>

0 comments on commit 43e570e

Please sign in to comment.