aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorDocile-Alligator <chineseperson5@gmail.com>2021-08-29 11:29:48 +0000
committerGitHub <noreply@github.com>2021-08-29 11:29:48 +0000
commit7adde523e4b84f47ba96dcfd23a692eb64d1d74e (patch)
treea7e7301316152cc07951e37c3175af72de5edfaa /app/src/main/res
parente66faaa9be78bea2e0e281933a5c5cb88b5312c1 (diff)
parente8aa33a2c651434680f40741d7342a6e066bea68 (diff)
downloadinfinity-for-reddit-7adde523e4b84f47ba96dcfd23a692eb64d1d74e.tar
infinity-for-reddit-7adde523e4b84f47ba96dcfd23a692eb64d1d74e.tar.gz
infinity-for-reddit-7adde523e4b84f47ba96dcfd23a692eb64d1d74e.tar.bz2
infinity-for-reddit-7adde523e4b84f47ba96dcfd23a692eb64d1d74e.tar.lz
infinity-for-reddit-7adde523e4b84f47ba96dcfd23a692eb64d1d74e.tar.xz
infinity-for-reddit-7adde523e4b84f47ba96dcfd23a692eb64d1d74e.tar.zst
infinity-for-reddit-7adde523e4b84f47ba96dcfd23a692eb64d1d74e.zip
Merge pull request #331 from curche/time-format-arrays
Make time format strings less ambiguous
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/values/arrays.xml45
1 files changed, 23 insertions, 22 deletions
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 6c07857d..a2d77399 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -196,28 +196,29 @@
</string-array>
<string-array name="settings_time_format">
- <item>Jan 2, 2020, 01:00</item>
- <item>Jan 2, 2020, 01:00 PM</item>
- <item>2 Jan, 2020, 01:00</item>
- <item>2 Jan, 2020, 01:00 PM</item>
- <item>1/2/2020 01:00 (Month first)</item>
- <item>1/2/2020 01:00 PM (Month first)</item>
- <item>2/1/2020 01:00 (Day first)</item>
- <item>2/1/2020 01:00 PM (Day first)</item>
- <item>2020/1/2 01:00 (Month first)</item>
- <item>2020/1/2 01:00 PM (Month first)</item>
- <item>1-2-2020 01:00 (Month first)</item>
- <item>1-2-2020 01:00 PM (Month first)</item>
- <item>2-1-2020 01:00 (Day first)</item>
- <item>2-1-2020 01:00 PM (Day first)</item>
- <item>2020-1-2 01:00 (Month first)</item>
- <item>2020-1-2 01:00 PM (Month first)</item>
- <item>1.2.2020 01:00 (Month first)</item>
- <item>1.2.2020 01:00 PM (Month first)</item>
- <item>2.1.2020 01:00 (Day first)</item>
- <item>2.1.2020 01:00 PM (Day first)</item>
- <item>2020.1.2 01:00 (Month first)</item>
- <item>2020.1.2 01:00 PM (Month first)</item>
+ <!-- 2020/01/23 23:45 -->
+ <item>Jan 23, 2020, 23:45</item>
+ <item>Jan 23, 2020, 11:45 PM</item>
+ <item>23 Jan, 2020, 23:45</item>
+ <item>23 Jan, 2020, 11:45 PM</item>
+ <item>1/23/2020 23:45</item>
+ <item>1/23/2020 11:45 PM</item>
+ <item>23/1/2020 23:45</item>
+ <item>23/1/2020 11:45 PM</item>
+ <item>2020/1/23 23:45</item>
+ <item>2020/1/23 11:45 PM</item>
+ <item>1-23-2020 23:45</item>
+ <item>1-23-2020 11:45 PM</item>
+ <item>23-1-2020 23:45</item>
+ <item>23-1-2020 11:45 PM</item>
+ <item>2020-1-23 23:45</item>
+ <item>2020-1-23 11:45 PM</item>
+ <item>1.23.2020 23:45</item>
+ <item>1.23.2020 11:45 PM</item>
+ <item>23.1.2020 23:45</item>
+ <item>23.1.2020 11:45 PM</item>
+ <item>2020.1.23 23:45</item>
+ <item>2020.1.23 11:45 PM</item>
</string-array>
<string-array name="settings_time_format_values">