Skip to content

Commit

Permalink
v21 (#203)
Browse files Browse the repository at this point in the history
* Update translations

* Update versionName and versionCode

* Update values-pt-rBR

* Update values-pt-rPT

* Update values-ru

* Add values-he and values-iw to support Hebrew

* Update values-de

* Set `food_quantities` as `translatable="false"`

* Remove non-translatable strings from values-de

* Remove non-translatable strings from values-he and values-iw

* Remove non-translatable strings from values-pt-rBR

* Remove non-translatable strings from values-pt-rPT

* Remove non-translatable strings from values-pt-ru

* Change `history_to_generate_choices` to be non-translatable

* Remove Toast in DebugActivity

* Fix warning in DebugActivity

* Add missing marginStart and marginEnd

* Escape `'` in values-he and values-iw

* Update versionCode

* Add values-ca

* Replace `'` with `\'`

* Update versionCode

* en, ca, de, he (iw), pt (rBR/rPT), ru udpates. (#199)

* Update versionCode and versionName

* ca, pt (rPT) translations xml update (#200)

* en, ca, de, he (iw), pt (rBR/rPT), ru udpates.

* Catalan and Portuguese (Portugal) translation update.

* Update versionCode and versionName

* tranlation updates: de, pl, pt-rPT (#202)

* Update versionCode and versionName

Co-authored-by: --marc <[email protected]>
  • Loading branch information
slavick and marc-medley authored May 1, 2022
1 parent 5280502 commit 6f0edc8
Show file tree
Hide file tree
Showing 21 changed files with 3,640 additions and 1,574 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ android {
minSdkVersion 16
targetSdkVersion 30
vectorDrawables.useSupportLibrary = true
versionCode 61
versionName "20"
versionCode 69
versionName "21"
}
buildTypes {
debug {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,7 @@ private void generateData(final boolean generateRandomData) {

@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
final int historyToGenerate = getNumDaysForChoice();
Common.showToast(view.getContext(), String.valueOf(historyToGenerate));
this.historyToGenerate = historyToGenerate;
this.historyToGenerate = getNumDaysForChoice();
}

private int getNumDaysForChoice() {
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/layout/activity_debug.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
style="@style/PrimaryText"
android:paddingLeft="16dp"
android:paddingStart="16dp"
android:paddingRight="16dp"
android:paddingEnd="16dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>

Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/layout/activity_notification_settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@
android:layout_below="@id/reminder_control_container"
android:layout_marginTop="20dp"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:layout_marginRight="20dp"
android:layout_marginEnd="20dp"
app:cardElevation="6dp">

<LinearLayout
Expand Down
9 changes: 0 additions & 9 deletions app/src/main/res/values-bg/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,6 @@
<item>Година</item>
</string-array>

<string-array name="history_to_generate_choices">
<item>1 месец</item>
<item>3 месеца</item>
<item>6 месеца</item>
<item>1 година</item>
<item>2 години</item>
<item>5 години</item>
</string-array>

<string-array name="food_info_types_beans">
<item>Черен боб</item>
<item>Папуда</item>
Expand Down
599 changes: 599 additions & 0 deletions app/src/main/res/values-ca/strings.xml

Large diffs are not rendered by default.

609 changes: 278 additions & 331 deletions app/src/main/res/values-de/strings.xml

Large diffs are not rendered by default.

9 changes: 0 additions & 9 deletions app/src/main/res/values-el/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,6 @@
<item>Έτος</item>
</string-array>

<string-array name="history_to_generate_choices">
<item>1 μήνα</item>
<item>3 μήνες</item>
<item>6 μήνες</item>
<item>1 έτος</item>
<item>2 έτη</item>
<item>5 έτη</item>
</string-array>

<string-array name="food_info_types_beans">
<item>Μαύρα</item>
<item>Μαυρομάτικα</item>
Expand Down
9 changes: 0 additions & 9 deletions app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,6 @@
<item>Año</item>
</string-array>

<string-array name="history_to_generate_choices">
<item>1 mes</item>
<item>3 meses</item>
<item>6 meses</item>
<item>1 año</item>
<item>2 años</item>
<item>5 años</item>
</string-array>

<string-array name="food_info_types_beans">
<item>Frijoles negros</item>
<item>Frijoles de careta</item>
Expand Down
9 changes: 0 additions & 9 deletions app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,6 @@
<item>Année</item>
</string-array>

<string-array name="history_to_generate_choices">
<item>1 mois</item>
<item>3 mois</item>
<item>6 mois</item>
<item>1 an</item>
<item>2 ans</item>
<item>5 ans</item>
</string-array>

<string-array name="food_info_types_beans">
<item>Haricots noirs</item>
<item>Haricots à oeil noir</item>
Expand Down
599 changes: 599 additions & 0 deletions app/src/main/res/values-he/strings.xml

Large diffs are not rendered by default.

9 changes: 0 additions & 9 deletions app/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,6 @@
<item>Anno</item>
</string-array>

<string-array name="history_to_generate_choices">
<item>1 mese</item>
<item>3 mesi</item>
<item>6 mesi</item>
<item>1 anno</item>
<item>2 anni</item>
<item>5 anno</item>
</string-array>

<string-array name="food_info_types_beans">
<item>Fagioli neri</item>
<item>Fagioli dall’occhio nero</item>
Expand Down
599 changes: 599 additions & 0 deletions app/src/main/res/values-iw/strings.xml

Large diffs are not rendered by default.

177 changes: 81 additions & 96 deletions app/src/main/res/values-pl/strings.xml

Large diffs are not rendered by default.

599 changes: 599 additions & 0 deletions app/src/main/res/values-pt-rBR/strings.xml

Large diffs are not rendered by default.

599 changes: 599 additions & 0 deletions app/src/main/res/values-pt-rPT/strings.xml

Large diffs are not rendered by default.

Loading

0 comments on commit 6f0edc8

Please sign in to comment.