[PATCH wireguard-android] Explicit indexing for 'import_partial_success'

[PATCH wireguard-android] Explicit indexing for 'import_partial_success'

[Eiji Tanioka]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 1018 bytes --]

When translate it to Japanese, values are exchanged.
For example, '1 of 10' is '10 個中の 1'.

So this string should be explicit indexed.

Signed-off-by: Eiji Tanioka <tanioka404@gmail.com>
---
 ui/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml
index 70d92c3..74c5be6 100644
--- a/ui/src/main/res/values/strings.xml
+++ b/ui/src/main/res/values/strings.xml
@@ -13,8 +13,8 @@
         <item quantity="other">%d tunnels selected</item>
     </plurals>
     <plurals name="import_partial_success">
-        <item quantity="one">Imported %d of %d tunnels</item>
-        <item quantity="other">Imported %d of %d tunnels</item>
+        <item quantity="one">Imported %1$d of %2$d tunnels</item>
+        <item quantity="other">Imported %1$d of %2$d tunnels</item>
     </plurals>
     <plurals name="import_total_success">
         <item quantity="one">Imported %d tunnel</item>
-- 
2.25.2

Re: [PATCH wireguard-android] Explicit indexing for 'import_partial_success'

[Eiji Tanioka]

Or is it possible to apply this fix only to Japanese in crowdin?

2020年3月25日(水) 21:19 Eiji Tanioka <tanioka404@gmail.com>:
>
> When translate it to Japanese, values are exchanged.
> For example, '1 of 10' is '10 個中の 1'.
>
> So this string should be explicit indexed.
>
> Signed-off-by: Eiji Tanioka <tanioka404@gmail.com>
> ---
>  ui/src/main/res/values/strings.xml | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml
> index 70d92c3..74c5be6 100644
> --- a/ui/src/main/res/values/strings.xml
> +++ b/ui/src/main/res/values/strings.xml
> @@ -13,8 +13,8 @@
>          <item quantity="other">%d tunnels selected</item>
>      </plurals>
>      <plurals name="import_partial_success">
> -        <item quantity="one">Imported %d of %d tunnels</item>
> -        <item quantity="other">Imported %d of %d tunnels</item>
> +        <item quantity="one">Imported %1$d of %2$d tunnels</item>
> +        <item quantity="other">Imported %1$d of %2$d tunnels</item>
>      </plurals>
>      <plurals name="import_total_success">
>          <item quantity="one">Imported %d tunnel</item>
> --
> 2.25.2
>

Re: [PATCH wireguard-android] Explicit indexing for 'import_partial_success'

[Harsh Shandilya]

On Wed, 25 Mar 2020 at 18:26, Eiji Tanioka <tanioka404@gmail.com> wrote:
>
> Or is it possible to apply this fix only to Japanese in crowdin?

There's no need to do that, this fix is applicable to all languages
including the default English.

> 2020年3月25日(水) 21:19 Eiji Tanioka <tanioka404@gmail.com>:
> >
> > When translate it to Japanese, values are exchanged.
> > For example, '1 of 10' is '10 個中の 1'.
> >
> > So this string should be explicit indexed.
> >
> > Signed-off-by: Eiji Tanioka <tanioka404@gmail.com>
> > ---
> >  ui/src/main/res/values/strings.xml | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml
> > index 70d92c3..74c5be6 100644
> > --- a/ui/src/main/res/values/strings.xml
> > +++ b/ui/src/main/res/values/strings.xml
> > @@ -13,8 +13,8 @@
> >          <item quantity="other">%d tunnels selected</item>
> >      </plurals>
> >      <plurals name="import_partial_success">
> > -        <item quantity="one">Imported %d of %d tunnels</item>
> > -        <item quantity="other">Imported %d of %d tunnels</item>
> > +        <item quantity="one">Imported %1$d of %2$d tunnels</item>
> > +        <item quantity="other">Imported %1$d of %2$d tunnels</item>
> >      </plurals>
> >      <plurals name="import_total_success">
> >          <item quantity="one">Imported %d tunnel</item>
> > --
> > 2.25.2
> >

Applied, thanks!