From 1834146ad02cfa9c60ee053ea7f1115fddd3dfd0 Mon Sep 17 00:00:00 2001 From: goapunk <goapunk@riseup.net> Date: Wed, 30 May 2018 15:10:39 +0200 Subject: [PATCH] fix hebrew --- briar-android/.gitignore | 1 + briar-android/build.gradle | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/briar-android/.gitignore b/briar-android/.gitignore index 2efc20c365..4d702fcd88 100644 --- a/briar-android/.gitignore +++ b/briar-android/.gitignore @@ -4,3 +4,4 @@ build local.properties .settings src/main/assets/*.zip +src/main/res/values-iw diff --git a/briar-android/build.gradle b/briar-android/build.gradle index 2dd91ee029..ce80f54071 100644 --- a/briar-android/build.gradle +++ b/briar-android/build.gradle @@ -300,13 +300,25 @@ task verifyTranslations { } } folders.each { n -> - if (!translations.remove(n)) { + if (!translations.remove(n) && n != 'iw') { throw new GradleException("Translation " + n + " is missing in $file") } } if (translations.size() != 0) throw new GradleException("Translations\n" + translations.join("\n") + "\nhave no matching value folder") + + // Some devices use iw instead of he for hebrew + def hebrew_legacy = new File("briar-android/src/main/res/values-iw") + def hebrew = new File("briar-android/src/main/res/values-he") + // Copy values-he to values-iw + if (hebrew.exists()) { + hebrew_legacy.mkdir() + copy { + from 'src/main/res/values-he' + into 'src/main/res/values-iw' + } + } } } -- GitLab