Skip to content

Commit

Permalink
2.0.14
Browse files Browse the repository at this point in the history
  • Loading branch information
Dwynr committed Apr 20, 2022
1 parent ac99465 commit 6e9bee5
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 11 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions ios/Filen.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -756,7 +756,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.0.13;
MARKETING_VERSION = 2.0.14;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -780,15 +780,15 @@
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;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.0.13;
MARKETING_VERSION = 2.0.14;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "filen-mobile",
"version": "2.0.13",
"version": "2.0.14",
"private": true,
"scripts": {
"android": "react-native run-android",
Expand Down
6 changes: 5 additions & 1 deletion src/i18n/i18n.js
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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]

Expand Down
2 changes: 1 addition & 1 deletion src/i18n/lang/ru.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export const ru = {
shared: "Общий доступ",
recents: "Недавние",
settings: "Настройки",
transfers: "Трансакции",
transfers: "передачи",
home: "Главная",
photos: "Фото",
favorites: "Избранное",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/lang/uk.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export const uk = {
shared: "Спільний доступ",
recents: "Недавні",
settings: "Налаштування",
transfers: "Трансакції",
transfers: "передачі",
home: "Головна",
photos: "Фото",
favorites: "Обране",
Expand Down
2 changes: 1 addition & 1 deletion src/lib/permissions.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down

1 comment on commit 6e9bee5

@DanielProg39
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you know Russian and Ukrainian?)
I was thinking a lot on some translations, even used to check dictionaries. I chose to use "трансакции" and "трансакції" because other synonyms have several different meanings and can be (hypothetically) misunderstood. For example, передачи/передачі is more associated with transmitting real objects, not digital, or transferring some rights. Not to tell that if used as a noun, it means tv program, show and a shedule.
So that I chose трансакции/трансакції to be more precise.
Anyway, I fully agree with new translation, so I'm in favor of keeping it.

Please sign in to comment.