diff --git a/android/app/build.gradle b/android/app/build.gradle index 3acbcf24d..0c1ae3c5b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -134,8 +134,8 @@ android { applicationId "io.filen.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 213 - versionName "2.0.13" + versionCode 214 + versionName "2.0.14" } splits { abi { diff --git a/ios/Filen.xcodeproj/project.pbxproj b/ios/Filen.xcodeproj/project.pbxproj index f5a9c1ea0..dc9dedfa7 100644 --- a/ios/Filen.xcodeproj/project.pbxproj +++ b/ios/Filen.xcodeproj/project.pbxproj @@ -747,7 +747,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Filen/Filen.entitlements; - CURRENT_PROJECT_VERSION = 213; + CURRENT_PROJECT_VERSION = 214; DEVELOPMENT_TEAM = 7YTW5D2K7P; ENABLE_BITCODE = NO; INFOPLIST_FILE = Filen/Info.plist; @@ -756,7 +756,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.0.13; + MARKETING_VERSION = 2.0.14; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -780,7 +780,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Filen/Filen.entitlements; - CURRENT_PROJECT_VERSION = 213; + CURRENT_PROJECT_VERSION = 214; DEVELOPMENT_TEAM = 7YTW5D2K7P; INFOPLIST_FILE = Filen/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; @@ -788,7 +788,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.0.13; + MARKETING_VERSION = 2.0.14; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/package.json b/package.json index b643a0220..b9a1876a0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "filen-mobile", - "version": "2.0.13", + "version": "2.0.14", "private": true, "scripts": { "android": "react-native run-android", diff --git a/src/i18n/i18n.js b/src/i18n/i18n.js index 9ba930798..c93eb4745 100644 --- a/src/i18n/i18n.js +++ b/src/i18n/i18n.js @@ -1,7 +1,7 @@ import { en } from "./lang/en" import { ja } from "./lang/ja" import { de } from "./lang/de" -import { fr } from "./lang/de" +import { fr } from "./lang/fr" import { it } from "./lang/it" import { ru } from "./lang/ru" import { uk } from "./lang/uk" @@ -20,6 +20,10 @@ export const i18n = (lang = "en", text, firstUpperCase = true, replaceFrom = [], if(typeof lang !== "string"){ lang = "en" } + + if(typeof translations[lang] == "undefined"){ + lang = "en" + } let gotText = translations[lang][text] diff --git a/src/i18n/lang/ru.js b/src/i18n/lang/ru.js index a486e8355..081b8d7ce 100644 --- a/src/i18n/lang/ru.js +++ b/src/i18n/lang/ru.js @@ -3,7 +3,7 @@ export const ru = { shared: "Общий доступ", recents: "Недавние", settings: "Настройки", - transfers: "Трансакции", + transfers: "передачи", home: "Главная", photos: "Фото", favorites: "Избранное", diff --git a/src/i18n/lang/uk.js b/src/i18n/lang/uk.js index baab3b767..21dd14dfa 100644 --- a/src/i18n/lang/uk.js +++ b/src/i18n/lang/uk.js @@ -3,7 +3,7 @@ export const uk = { shared: "Спільний доступ", recents: "Недавні", settings: "Налаштування", - transfers: "Трансакції", + transfers: "передачі", home: "Головна", photos: "Фото", favorites: "Обране", diff --git a/src/lib/permissions.js b/src/lib/permissions.js index cb2affee5..e13435ba4 100644 --- a/src/lib/permissions.js +++ b/src/lib/permissions.js @@ -130,7 +130,7 @@ export const hasBiometricPermissions = (requestPermissions = true) => { export const hasPhotoLibraryPermissions = (requestPermissions = true) => { return new Promise(async (resolve, reject) => { if(Platform.OS == "android"){ - hasStoragePermissions().then(resolve).catch(reject) + hasStoragePermissions(requestPermissions).then(resolve).catch(reject) } else{ checkMultiple([PERMISSIONS.IOS.PHOTO_LIBRARY, PERMISSIONS.IOS.PHOTO_LIBRARY_ADD_ONLY]).then((statuses) => {