diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 6a740052..293b918c 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -2,7 +2,7 @@ fastlane_require "base64"
fastlane_require "fileutils"
fastlane_require "json"
-IOS_APP_VERSION = "2.1.4"
+IOS_APP_VERSION = "2.1.5"
ANDROID_APP_VERSION = "2.1.2" # run `fastlane bootstrap` after editing this
PROJECT_NAME = "Discourse"
IOS_TEAM_ID = "6T3LU73T8S"
diff --git a/ios/Discourse.xcodeproj/project.pbxproj b/ios/Discourse.xcodeproj/project.pbxproj
index 0f461f1c..db53bd23 100644
--- a/ios/Discourse.xcodeproj/project.pbxproj
+++ b/ios/Discourse.xcodeproj/project.pbxproj
@@ -471,7 +471,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
- CURRENT_PROJECT_VERSION = 659;
+ CURRENT_PROJECT_VERSION = 660;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = 6T3LU73T8S;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6T3LU73T8S;
@@ -516,7 +516,7 @@
CODE_SIGN_ENTITLEMENTS = Discourse/Discourse.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
- CURRENT_PROJECT_VERSION = 659;
+ CURRENT_PROJECT_VERSION = 660;
DEVELOPMENT_TEAM = 6T3LU73T8S;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6T3LU73T8S;
ENABLE_BITCODE = NO;
diff --git a/ios/Discourse/Info.plist b/ios/Discourse/Info.plist
index b5d0aa3c..98dc4ffa 100644
--- a/ios/Discourse/Info.plist
+++ b/ios/Discourse/Info.plist
@@ -19,7 +19,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 2.1.4
+ 2.1.5
CFBundleSignature
????
CFBundleURLTypes
@@ -37,7 +37,7 @@
CFBundleVersion
- 659
+ 660
Fabric
APIKey
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index dc9517b2..f170bee9 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -2968,12 +2968,12 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/yoga"
SPEC CHECKSUMS:
- boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90
- DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
+ boost: 1dca942403ed9342f98334bf4c3621f011aa7946
+ DoubleConversion: f16ae600a246532c4020132d54af21d0ddb2a385
fast_float: b32c788ed9c6a8c584d114d0047beda9664e7cc6
FBLazyVector: 86588b5a1547e7a417942a08f49559b184e002c8
- fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
- glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
+ fmt: 01b82d4ca6470831d1cc0852a1af644be019e8f6
+ glog: 08b301085f15bcbb6ff8632a8ebaf239aae04e6a
hermes-engine: bbc1152da7d2d40f9e59c28acc6576fcf5d28e2a
RCT-Folly: 846fda9475e61ec7bcbf8a3fe81edfcaeb090669
RCTDeprecation: 300c5eb91114d4339b0bb39505d0f4824d7299b7
@@ -3064,4 +3064,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: a07593ed40b3f5969398880f8b566d318472ee3b
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2
diff --git a/ios/ShareExtension/Info.plist b/ios/ShareExtension/Info.plist
index 680728d3..dc71f146 100644
--- a/ios/ShareExtension/Info.plist
+++ b/ios/ShareExtension/Info.plist
@@ -17,9 +17,9 @@
CFBundlePackageType
$(PRODUCT_BUNDLE_PACKAGE_TYPE)
CFBundleShortVersionString
- 2.1.4
+ 2.1.5
CFBundleVersion
- 659
+ 660
NSExtension
NSExtensionAttributes
diff --git a/js/Discourse.js b/js/Discourse.js
index b9ab3c9d..86c273e9 100644
--- a/js/Discourse.js
+++ b/js/Discourse.js
@@ -52,7 +52,7 @@ i18n.translations = {
de: require('./locale/de.json'),
en: require('./locale/en.json'),
es: require('./locale/es.json'),
- fa: require('./locale/fa.json'),
+ fa: require('./locale/fa_IR.json'),
fi: require('./locale/fi.json'),
fr: require('./locale/fr.json'),
he: require('./locale/he.json'),
diff --git a/js/site_manager.js b/js/site_manager.js
index 5a581bca..4080fd73 100644
--- a/js/site_manager.js
+++ b/js/site_manager.js
@@ -630,7 +630,7 @@ class SiteManager {
this.activeSite = null;
}
- async urlInSites(url) {
+ urlInSites(url) {
const forcedHttpsUrl = url.replace('http://', 'https://');
let siteUrls = this.sites.map(s => s.url);