mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-01-18 20:08:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,605 Commits 43 Branches 156 Tags
googleAndroidStudioBugReport
Commit Graph

3605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sylvia van Os
aa515b1192 Be more explicit in quantity 
Translators still keep triggering the linter with errors such as the
following:
Error: The quantity 'one' matches more than one specific number in this locale (1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, …), but the message did not include a formatting argument (such as %d). This is usually an internationalization error. See full issue explanation for more. [ImpliedQuantity]
 2021-08-01 12:50:56 +02:00
Sylvia van Os
068660fe3f Merge pull request #305 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-08-01 12:42:14 +02:00
solokot
99ffaf97d1 Translated using Weblate (Russian) 
Currently translated at 100.0% (172 of 172 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-08-01 12:32:51 +02:00
Heimen Stoffels
b53999c1cf Translated using Weblate (Dutch) 
Currently translated at 100.0% (172 of 172 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2021-08-01 12:32:51 +02:00
Allan Nordhøy
57f87d7dc0 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 90.6% (156 of 172 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
 2021-08-01 12:32:50 +02:00
J. Lavoie
760f6a873d Translated using Weblate (Italian) 
Currently translated at 100.0% (172 of 172 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/it/
 2021-08-01 12:32:50 +02:00
J. Lavoie
675bd43ff8 Translated using Weblate (French) 
Currently translated at 100.0% (172 of 172 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/
 2021-08-01 12:32:50 +02:00
J. Lavoie
07532ce001 Translated using Weblate (Spanish) 
Currently translated at 100.0% (172 of 172 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/es/
 2021-08-01 12:32:50 +02:00
J. Lavoie
908a7055c7 Translated using Weblate (German) 
Currently translated at 100.0% (172 of 172 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
 2021-08-01 12:32:49 +02:00
Sylvia van Os
2be371caed Forgot number 2021-07-30 19:46:10 +02:00
Sylvia van Os
f4f3f2e307 Increase i18n flexibility 
The following may seem weird, but it is necessary to give translators enough flexibility. For example, in Russian, Android's plural quantity "one" actually refers to "any number ending on 1 but not ending in 11". So while in English the extra non-plural form seems unnecessary duplication, it is necessary to give translators enough flexibility. Therefore, we use the plain string when meaning exactly 1, and otherwise use the plural forms.
 2021-07-30 19:40:43 +02:00
Sylvia van Os
edbf76c7dc Merge pull request #303 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-07-30 19:02:48 +02:00
109247019824
f8615f45f0 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (170 of 170 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/bg/
 2021-07-30 18:18:55 +02:00
IllusiveMan196
c3bc3e9911 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (170 of 170 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/uk/
 2021-07-30 18:18:55 +02:00
solokot
8adcca1df2 Translated using Weblate (Russian) 
Currently translated at 100.0% (170 of 170 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-07-30 18:18:55 +02:00
Heimen Stoffels
bdde8669ac Translated using Weblate (Dutch) 
Currently translated at 100.0% (170 of 170 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2021-07-30 18:18:55 +02:00
solokot
59db2df525 Translated using Weblate (Russian) 
Currently translated at 100.0% (170 of 170 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-07-30 18:18:55 +02:00
Sylvia van Os
3b83ff5b0e Fix syntax 2021-07-30 18:18:32 +02:00
Heimen Stoffels
19fb290a51 Translated using Weblate (Dutch) 
Currently translated at 100.0% (170 of 170 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2021-07-30 18:15:39 +02:00
Allan Nordhøy
e1e823d9e0 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 90.0% (153 of 170 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
 2021-07-30 18:15:30 +02:00
Sylvia van Os
7ed477b670 Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker 2021-07-29 22:16:47 +02:00
Sylvia van Os
1960fb0b6a Fix fullscreen loss on rotation 2021-07-29 22:16:36 +02:00
Sylvia van Os
e913482790 Merge pull request #299 from comradekingu/patch-7 
New strings reworked
 2021-07-29 21:54:43 +02:00
Allan Nordhøy
2e5bd76d31 New strings reworked 2021-07-29 19:47:10 +00:00
Sylvia van Os
876ae979da Simplify updateTempState 
Hopefully fixes the few weird crashes on Google Play
 2021-07-29 21:42:21 +02:00
Sylvia van Os
d918c15ad6 Prevent ArithmeticException 2021-07-29 21:18:21 +02:00
Sylvia van Os
d57cb307c3 Support multi-deleting cards 2021-07-29 20:38:37 +02:00
Sylvia van Os
cbcf1bcd99 Use desugaring to upgrade zxing without having to increase minSdk 
As documented by the zxing team on https://github.com/zxing/zxing/wiki/Frequently-Asked-Questions#it-doesnt-work-with-java-7--no-interface-method-sortljavautilcomparator
 2021-07-28 23:05:27 +02:00
Sylvia van Os
96bc10583f Fix colour dialog selected colour 2021-07-27 22:04:09 +02:00
Sylvia van Os
5ca4d29a36 Release Catima 2.0.4 v2.0.4 2021-07-27 21:42:04 +02:00
Sylvia van Os
2efb666fae Fix loyalty card colour changing 2021-07-27 21:38:54 +02:00
Sylvia van Os
89dce1068f Shortcut fixes 2021-07-27 21:26:24 +02:00
Sylvia van Os
9854125af9 Make lint happy 2021-07-26 23:37:17 +02:00
Sylvia van Os
6e307ab1f0 Update dependencies 2021-07-26 23:10:51 +02:00
Sylvia van Os
c4f0d1bef6 Release Catima 2.0.3 v2.0.3 2021-07-25 22:32:40 +02:00
Sylvia van Os
5201788818 Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker v2.0.2 2021-07-25 21:52:10 +02:00
Sylvia van Os
8472bc9755 Make SpotBugs happy 2021-07-25 21:51:46 +02:00
Sylvia van Os
ce0f531831 Merge pull request #289 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-07-25 21:41:26 +02:00
Quentin PAGÈS
18e9c3ccb5 Translated using Weblate (Occitan) 
Currently translated at 32.3% (55 of 170 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/oc/
 2021-07-25 21:40:25 +02:00
Sylvia van Os
19afe8e69c Simplify edit activity and fix some status bugs 2021-07-25 21:40:15 +02:00
Sylvia van Os
8e5bace7cc Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker 2021-07-23 23:52:58 +02:00
Sylvia van Os
1ca85e9d7b Create unit test for broken onResume behaviour 2021-07-23 23:52:45 +02:00
Sylvia van Os
eb24af8266 Add Zip4j to used libraries list 2021-07-22 12:14:39 +02:00
Sylvia van Os
12ba01eb87 Merge pull request #287 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-07-21 23:32:51 +02:00
Quentin PAGÈS
a0e30bdccc Added translation using Weblate (Occitan) 2021-07-21 23:26:38 +02:00
Sylvia van Os
4663e22128 Rename Spanish metadata to something fastlane supply can push to Google Play 2021-07-21 18:42:27 +02:00
Sylvia van Os
7bd1d16d24 Merge pull request #286 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-07-21 18:37:32 +02:00
Diego
fd838cfd43 Translated using Weblate (Spanish) 
Currently translated at 100.0% (3 of 3 strings)

Translation: Catima/Fastlane
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/es/
 2021-07-21 18:32:48 +02:00
Diego
1eca79b4cb Translated using Weblate (Spanish) 
Currently translated at 100.0% (170 of 170 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/es/
 2021-07-21 18:32:48 +02:00
Sylvia van Os
1d694f5f2c Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker v2.0.1 2021-07-21 18:23:05 +02:00