Fix multi entry formats, resolves #1428

8 files changed, 9 insertions, 7 deletions

diff --git a/app/src/main/play/en-US/whatsnew b/app/src/main/play/en-US/whatsnew
index 3c3943fb..009f4196 100644
--- a/app/src/main/play/en-US/whatsnew
+++ b/app/src/main/play/en-US/whatsnew
@@ -5,4 +5,5 @@ v2.3.0
 * Update theme
 * Update translations
 * Add fingerprint unlock screen
-* Fix messenger redirect
\ No newline at end of file
+* Fix messenger redirect
+* Lots of internal updates
\ No newline at end of file
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 7f9b4233..9c752040 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -56,7 +56,7 @@
 
     The first element is the day, and the second element is the time
     -->
-    <string name="time_template">%1s à %2s</string>
+    <string name="time_template">%1$s à %2$s</string>
 
     <string name="disclaimer">Clause de non-responsabilité</string>
 
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 10ae1056..86f0bd4a 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -57,7 +57,7 @@
 
     The first element is the day, and the second element is the time
     -->
-    <string name="time_template">%1s às %2s</string>
+    <string name="time_template">%1$s às %2$s</string>
 
     <string name="disclaimer">Aviso Legal</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 29d00a6f..c2660c6a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -74,7 +74,7 @@
 
     The first element is the day, and the second element is the time
     -->
-    <string name="time_template">%1s at %2s</string>
+    <string name="time_template">%1$s at %2$s</string>
 
     <string name="disclaimer">Disclaimer</string>
 
diff --git a/app/src/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml
index 3e4f9036..94c4fcdf 100644
--- a/app/src/main/res/xml/frost_changelog.xml
+++ b/app/src/main/res/xml/frost_changelog.xml
@@ -13,7 +13,7 @@
     <item text="Update translations" />
     <item text="Add fingerprint unlock screen" />
     <item text="Fix messenger redirect" />
-    <item text="" />
+    <item text="Lots of internal updates" />
     <item text="" />
     <item text="" />
     <item text="" />
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index df15d665..40b565b5 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -27,7 +27,7 @@ object Versions {
     // https://github.com/square/okhttp/releases
     const val okhttp = "3.14.1"
     // https://developer.android.com/jetpack/androidx/releases/room
-    const val room = "2.1.0-rc01"
+    const val room = "2.1.0"
     // http://robolectric.org/getting-started/
     const val roboelectric = "4.2"
     // https://github.com/davemorrissey/subsampling-scale-image-view#quick-start
diff --git a/docs/Changelog.md b/docs/Changelog.md
index b7320066..c54156d4 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -7,6 +7,7 @@
 * Update translations
 * Add fingerprint unlock screen
 * Fix messenger redirect
+* Lots of internal updates
 
 ## v2.2.4
 * Show top bar to allow sharing posts
diff --git a/gradle.properties b/gradle.properties
index 5b4637fd..d6291564 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,7 +16,7 @@ org.gradle.daemon = true
 APP_ID=Frost
 APP_GROUP=com.pitchedapps
 
-KAU=e1849c9
+KAU=20e7919
 
 android.useAndroidX=true
 android.enableJetifier=true