summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorOskar <oskar@mullvad.net>2024-11-04 07:57:15 +0100
committerOskar <oskar@mullvad.net>2024-11-14 16:43:38 +0100
commit7d2fb0c304cd680cc66da49ec0c9af947b7f7a41 (patch)
tree3c7a0aa8cf376b01cd0498d7cc3b73aa5fd94c99 /android
parentd2276df2dacd46a43df9bf5c631f1a8bd5ce8a0c (diff)
downloadmullvadvpn-7d2fb0c304cd680cc66da49ec0c9af947b7f7a41.tar.xz
mullvadvpn-7d2fb0c304cd680cc66da49ec0c9af947b7f7a41.zip
Update android gui references
Diffstat (limited to 'android')
-rw-r--r--android/README.md12
-rw-r--r--android/translations-converter/README.md6
-rw-r--r--android/translations-converter/src/main.rs2
3 files changed, 10 insertions, 10 deletions
diff --git a/android/README.md b/android/README.md
index d90355374c..38997fbbc3 100644
--- a/android/README.md
+++ b/android/README.md
@@ -54,8 +54,8 @@ scripts/tidy.sh formatAndCheckDiff
```
#### macOS
-Since macOS is using a different version of `sed` running the tidy script (`scripts/tidy.sh`) will
-lead to the creation of a large number of files ending with `-e`. The recommended fix for this
+Since macOS is using a different version of `sed` running the tidy script (`scripts/tidy.sh`) will
+lead to the creation of a large number of files ending with `-e`. The recommended fix for this
issue is to install the gnu version of `sed`. This can be done by running:
`brew install gnu-sed` and then set `gnu-sed` as your default `sed`.
@@ -66,12 +66,12 @@ strict. See each `build.gradle.kts`for more information.
## Translations and localization
-See the [locale README][gui-locales-readme] for how to easily update translations. It also includes
-documentation for which phrases and terms shouldn't be translated (Do Not Translate). Also see the
-[translations converter README](translations-converter-readme) for documentation about
+See the [locale README][desktop-locales-readme] for how to easily update translations. It also
+includes documentation for which phrases and terms shouldn't be translated (Do Not Translate).
+Also see the [translations converter README](translations-converter-readme) for documentation about
the tool used to sync translations between the Android and Desktop apps.
-[gui-locales-readme]: ../gui/locales/README.md
+[desktop-locales-readme]: ../desktop/packages/mullvad-vpn/locales/README.md
[translations-converter-readme]: ./translations-converter/README.md
## Icons and assets
diff --git a/android/translations-converter/README.md b/android/translations-converter/README.md
index 5294867751..1d5c02f279 100644
--- a/android/translations-converter/README.md
+++ b/android/translations-converter/README.md
@@ -13,11 +13,11 @@ cargo run
The tool creates the appropriate localized message files and directories under the
[Android project resources](android-resources) (e.g. [values-sv/strings.xml](values-sv-example))
-for each locale it can find in the [`gui/locales` directory][gui-locales]. It will also update the
+for each locale it can find in the [`desktop/packages/mullvad-vpn/locales` directory][desktop-locales]. It will also update the
[messages.pot] template file with the string messages from the Android app for which it did not find
any translation, making it simpler to use the template for obtaining those translations.
[android-resources]: ../lib/resource/src/main/res/
-[gui-locales]: ../gui/locales/
-[messages.pot]: ../gui/locales/messages.pot
+[desktop-locales]: ../desktop/packages/mullvad-vpn/locales/
+[messages.pot]: ../desktop/packages/mullvad-vpn/locales/messages.pot
[values-sv-example]: ../lib/resource/src/main/res/values-sv/strings.xml
diff --git a/android/translations-converter/src/main.rs b/android/translations-converter/src/main.rs
index 7a340d7483..da5b6e3a27 100644
--- a/android/translations-converter/src/main.rs
+++ b/android/translations-converter/src/main.rs
@@ -79,7 +79,7 @@ fn main() {
})
.collect();
- let locale_dir = Path::new("../../gui/locales");
+ let locale_dir = Path::new("../../desktop/packages/mullvad-vpn/locales");
let locale_files = fs::read_dir(locale_dir)
.expect("Failed to open root locale directory")
.filter_map(|dir_entry_result| dir_entry_result.ok().map(|dir_entry| dir_entry.path()))