FIX: Android Settings screen was broken on non-English devices

discourse · Aug 2, 2024 · 917517d · 917517d
1 parent abe14e0
commit 917517d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -98,7 +98,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
-        versionCode 198
+        versionCode 206
         versionName MYAPP_VERSION
     }
 

diff --git a/android/build.gradle b/android/build.gradle
@@ -3,9 +3,9 @@
 buildscript {
     ext {
         minSdkVersion = 25
-        compileSdkVersion = 33
-        targetSdkVersion = 33
-        buildToolsVersion = "33.0.0"
+        compileSdkVersion = 34
+        targetSdkVersion = 34
+        buildToolsVersion = "34.0.0"
         // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
         ndkVersion = "23.1.7779620"
         kotlinVersion = '1.7.0'

diff --git a/ios/Discourse.xcodeproj/project.pbxproj b/ios/Discourse.xcodeproj/project.pbxproj
@@ -479,7 +479,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 493;
+				CURRENT_PROJECT_VERSION = 494;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 6T3LU73T8S;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6T3LU73T8S;
@@ -524,7 +524,7 @@
 				CODE_SIGN_ENTITLEMENTS = Discourse/Discourse.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 493;
+				CURRENT_PROJECT_VERSION = 494;
 				DEVELOPMENT_TEAM = 6T3LU73T8S;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6T3LU73T8S;
 				ENABLE_BITCODE = NO;

diff --git a/ios/Discourse/Info.plist b/ios/Discourse/Info.plist
@@ -37,7 +37,7 @@
 		<dict/>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>493</string>
+	<string>494</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

diff --git a/ios/ShareExtension/Info.plist b/ios/ShareExtension/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.0.2</string>
 	<key>CFBundleVersion</key>
-	<string>493</string>
+	<string>494</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

diff --git a/js/screens/HomeScreen.js b/js/screens/HomeScreen.js
@@ -238,7 +238,7 @@ class HomeScreen extends React.Component {
   // }
 
   onDidPressAndroidSettingsIcon() {
-    this.props.navigation.navigate('Settings');
+    this.props.navigation.navigate(i18n.t('settings'));
   }
 
   render() {