Fix android DAITA strings and translations #7329

albin-mullvad · 2024-12-11T17:02:49Z

This PR aims to align and fix some of DAITA related strings and translations.

TODO:

Double check whether it should be Go to %s settings (like the desktop app) or Open %s settings.

This change is

linear · 2024-12-11T17:02:52Z

DROID-1642 Fix android daita translations

Pururun

I get a lot of java.util.MissingFormatArgumentException: Format specifier '%s' for several strings with arguments. I am not sure why.

Reviewed 25 of 25 files at r1, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @albin-mullvad)

android/lib/resource/src/main/res/values/strings.xml line 378 at r1 (raw file):

    <string name="feature_server_ip_override">Server IP override</string>
    <string name="feature_custom_mtu">MTU</string>
    <string name="feature_daita">DAITA</string>

This needs to be changed in FeatureIndicatorsPanel

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DaitaScreen.kt line 217 at r1 (raw file):

                stringResource(
                    R.string.daita_description_slide_1_third_paragraph,
                    stringResource(id = R.string.daita),

This does not require argument

Rawa

Reviewed 21 of 25 files at r1, 7 of 7 files at r2, all commit messages.
Reviewable status: all files reviewed, 4 unresolved discussions (waiting on @albin-mullvad)

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/SelectLocationList.kt line 112 at r2 (raw file):

        Text(
            text =
                stringResource(

🙈

android/lib/resource/lint-baseline.xml line 8 at r2 (raw file):

        message="Inconsistent number of arguments in formatting string `daita_description_slide_2_second_paragraph`; found both 1 here and 2 in values/strings.xml"
        errorLine1="    &lt;string name=&quot;daita_description_slide_2_second_paragraph&quot;>Daher verwenden wir automatisch Multihop, um %1$s mit jedem Server zu aktivieren.&lt;/string>"
        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

Have we tried that this works fine? Some languages only using 2 arguments while others are using 1.

Pururun

Reviewed all commit messages.
Reviewable status: all files reviewed, 5 unresolved discussions (waiting on @albin-mullvad)

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DaitaScreen.kt line 235 at r2 (raw file):

                    R.string.daita_description_slide_2_second_paragraph,
                    stringResource(id = R.string.daita),
                    stringResource(id = R.string.daita)

Probably nicer to have %1$s in the string, but maybe that won't work with the translation script?

albin-mullvad

Reviewable status: 21 of 30 files reviewed, 5 unresolved discussions (waiting on @Pururun and @Rawa)

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DaitaScreen.kt line 217 at r1 (raw file):
You sure? 🤔 This is the string:

If an observer monitors these data packets, %s makes it significantly harder for them to identify which websites you are visiting or with whom you are communicating.

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DaitaScreen.kt line 235 at r2 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

Probably nicer to have %1$s in the string, but maybe that won't work with the translation script?

I can try that 👍

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/SelectLocationList.kt line 112 at r2 (raw file):

Previously, Rawa (David Göransson) wrote…

🙈

Indeed...

android/lib/resource/src/main/res/values/strings.xml line 378 at r1 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

This needs to be changed in FeatureIndicatorsPanel

Done.

android/lib/resource/lint-baseline.xml line 8 at r2 (raw file):

Previously, Rawa (David Göransson) wrote…

Have we tried that this works fine? Some languages only using 2 arguments while others are using 1.

The lint warning seemed to suggest that it's fine, but will double check by running the app

Pururun

Reviewed 6 of 6 files at r3, 3 of 3 files at r4, all commit messages.
Reviewable status: all files reviewed, 4 unresolved discussions (waiting on @albin-mullvad and @Rawa)

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DaitaScreen.kt line 217 at r1 (raw file):

Previously, albin-mullvad wrote…

You sure? 🤔 This is the string:

If an observer monitors these data packets, %s makes it significantly harder for them to identify which websites you are visiting or with whom you are communicating.

Weird, it seems my comment got in the wrong place, it should referer to

stringResource(  
    R.string.daita\_description\_slide\_1\_second\_paragraph,  
    stringResource(id = R.string.daita),  
)

Rawa

Reviewed 1 of 6 files at r3, 2 of 3 files at r4.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @albin-mullvad and @Pururun)

android/lib/resource/lint-baseline.xml line 8 at r2 (raw file):

Previously, albin-mullvad wrote…

The lint warning seemed to suggest that it's fine, but will double check by running the app

👍 @Pururun tested, and it didn't crash the app. But yeah we should address this in the near future.

Rawa

Reviewed 1 of 6 files at r3, all commit messages.
Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @albin-mullvad and @Pururun)

.github/workflows/android-app.yml line 243 at r4 (raw file):

          - gradle-task: :test:arch:test --rerun-tasks
          - gradle-task: detekt
          - gradle-task: :app:lint

Should this change? or mistake?

Rawa

Reviewed 4 of 6 files at r3, 1 of 3 files at r4.
Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @albin-mullvad and @Pururun)

albin-mullvad

Reviewable status: 29 of 30 files reviewed, 3 unresolved discussions (waiting on @Pururun and @Rawa)

.github/workflows/android-app.yml line 243 at r4 (raw file):
Explained in git commit:

Limit linting to the app module in CI since it has the checkDependencies option set.

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DaitaScreen.kt line 217 at r1 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

Weird, it seems my comment got in the wrong place, it should referer to
stringResource(  
    R.string.daita\_description\_slide\_1\_second\_paragraph,  
    stringResource(id = R.string.daita),  
)

Done.

android/lib/resource/lint-baseline.xml line 8 at r2 (raw file):

Previously, Rawa (David Göransson) wrote…

👍 @Pururun tested, and it didn't crash the app. But yeah we should address this in the near future.

@Pururun did it look correct as well (apart from not crashing)?

Pururun

Reviewed all commit messages.
Reviewable status: 29 of 30 files reviewed, 2 unresolved discussions (waiting on @Rawa)

android/lib/resource/lint-baseline.xml line 8 at r2 (raw file):

Previously, albin-mullvad wrote…

@Pururun did it look correct as well (apart from not crashing)?

Yes looked fine, with quotation marks and everything.

albin-mullvad

Reviewable status: 28 of 30 files reviewed, 2 unresolved discussions (waiting on @Pururun and @Rawa)

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DaitaScreen.kt line 235 at r2 (raw file):

Previously, albin-mullvad wrote…

I can try that 👍

Seems to work well, I've added indices to all related strings

android/lib/resource/lint-baseline.xml line 8 at r2 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

Yes looked fine, with quotation marks and everything.

Perfect, thanks! 🎉

Limit linting to the app module in CI since it has the `checkDependencies` option set.

See the baseline added as part of this commit for details. The issue itself has been reported to Crowdin so we expect it to be addressed sooner rather than later.

albin-mullvad · 2024-12-12T17:41:32Z

This PR has now been rebased on top of #7337 in order to clarify the single baseline addition that this PR itself introduces.

Pururun

Reviewed 10 of 10 files at r6, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Rawa)

Rawa

Reviewed 8 of 10 files at r6, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved

Rawa

Reviewed 2 of 10 files at r6.
Reviewable status: complete! all files reviewed, all discussions resolved

albin-mullvad added the Android Issues related to Android label Dec 11, 2024

albin-mullvad requested a review from Pururun December 11, 2024 17:02

albin-mullvad self-assigned this Dec 11, 2024

Pururun requested changes Dec 11, 2024

View reviewed changes

albin-mullvad force-pushed the fix-android-daita-translations-droid-1642 branch 2 times, most recently from 5eb7615 to 7c1bed9 Compare December 12, 2024 10:11

Rawa reviewed Dec 12, 2024

View reviewed changes

Pururun reviewed Dec 12, 2024

View reviewed changes

albin-mullvad requested review from Pururun and Rawa December 12, 2024 13:56

albin-mullvad commented Dec 12, 2024

View reviewed changes

Pururun reviewed Dec 12, 2024

View reviewed changes

Rawa reviewed Dec 12, 2024

View reviewed changes

albin-mullvad requested review from Pururun and Rawa December 12, 2024 15:02

albin-mullvad commented Dec 12, 2024

View reviewed changes

Pururun reviewed Dec 12, 2024

View reviewed changes

albin-mullvad commented Dec 12, 2024

View reviewed changes

albin-mullvad requested a review from Pururun December 12, 2024 16:15

albin-mullvad marked this pull request as ready for review December 12, 2024 16:15

albin-mullvad added 7 commits December 12, 2024 17:54

Enable lint option checkAllWarnings

3dfff7c

Set lint issue NewerVersionAvailable to ignore

ff1fea0

Generate lint baseline

195dc4c

Change CI lint task to only run on app module

ae213a2

Limit linting to the app module in CI since it has the `checkDependencies` option set.

Fix android daita strings

97a735d

Add temporary baseline to silence translation issue

d9cb500

See the baseline added as part of this commit for details. The issue itself has been reported to Crowdin so we expect it to be addressed sooner rather than later.

Update translations

0a15d44

albin-mullvad force-pushed the fix-android-daita-translations-droid-1642 branch from 24e1ef0 to 0a15d44 Compare December 12, 2024 17:38

Pururun approved these changes Dec 12, 2024

View reviewed changes

Rawa reviewed Dec 13, 2024

View reviewed changes

Rawa approved these changes Dec 13, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix android DAITA strings and translations #7329

Fix android DAITA strings and translations #7329

albin-mullvad commented Dec 11, 2024 •

edited

Loading

linear bot commented Dec 11, 2024

Pururun left a comment

Rawa left a comment

Pururun left a comment

albin-mullvad left a comment

Pururun left a comment

Rawa left a comment

Rawa left a comment

Rawa left a comment

albin-mullvad left a comment

Pururun left a comment

albin-mullvad left a comment

albin-mullvad commented Dec 12, 2024

Pururun left a comment

Rawa left a comment

Rawa left a comment

Fix android DAITA strings and translations #7329

Are you sure you want to change the base?

Fix android DAITA strings and translations #7329

Conversation

albin-mullvad commented Dec 11, 2024 • edited Loading

linear bot commented Dec 11, 2024

Pururun left a comment

Choose a reason for hiding this comment

Rawa left a comment

Choose a reason for hiding this comment

Pururun left a comment

Choose a reason for hiding this comment

albin-mullvad left a comment

Choose a reason for hiding this comment

Pururun left a comment

Choose a reason for hiding this comment

Rawa left a comment

Choose a reason for hiding this comment

Rawa left a comment

Choose a reason for hiding this comment

Rawa left a comment

Choose a reason for hiding this comment

albin-mullvad left a comment

Choose a reason for hiding this comment

Pururun left a comment

Choose a reason for hiding this comment

albin-mullvad left a comment

Choose a reason for hiding this comment

albin-mullvad commented Dec 12, 2024

Pururun left a comment

Choose a reason for hiding this comment

Rawa left a comment

Choose a reason for hiding this comment

Rawa left a comment

Choose a reason for hiding this comment

albin-mullvad commented Dec 11, 2024 •

edited

Loading