Skip to content
This repository has been archived by the owner on Sep 6, 2019. It is now read-only.

Translations: String formatting migrated to positional format #1344

Closed
wants to merge 47 commits into from

Conversation

Phylon
Copy link
Contributor

@Phylon Phylon commented Feb 14, 2014

These changes render pending pull request (issue #1122) obsolete.

These changes render pending pull request (issue M66B#1122) obsolete.
@Phylon
Copy link
Contributor Author

Phylon commented Feb 14, 2014

Do not pull yet. There seem to be replacement errors in -ar / -he / -ku / -fa files.
I have to check these files again.

@M66B M66B added the pull label Feb 14, 2014
@Phylon
Copy link
Contributor Author

Phylon commented Feb 14, 2014

@M66B : I have checked the files again. Obviously only right-to-left scripts are affected. Probably the files are correct, but incorrectly displayed only (e.g. "1% xxxx $d" instead of "xxxx %1$d"). I was puzzled after I followed the link to the translations above and found that the arabic translation did not look as expected. I tried to make the same changes manually using my editor and the same result occurred. I hope Android will interpret the strings as intended. Things also change in the editor when a different character set is selected (ANSI, UTF, ...), so the sequence of characters seems to be as expected.

@Phylon
Copy link
Contributor Author

Phylon commented Feb 17, 2014

French and German Translation Update

@Phylon
Copy link
Contributor Author

Phylon commented Feb 17, 2014

Change applied to new Malayan translation.

@M66B
Copy link
Owner

M66B commented Feb 17, 2014

Thanks for updating, @Phylon !
I will apply this after the stable version.
Did you test this change?

@Phylon
Copy link
Contributor Author

Phylon commented Feb 17, 2014

No, sorry, no tests done so far. I only browsed through the files for a short check.
At this time, I have no idea how to build xprivacy or any other android app.
This may potentially change in the future. I have reviewed the betas though, when previous changes had been integrated. I hope you still find this contribution helpful.

@M66B
Copy link
Owner

M66B commented Feb 18, 2014

@Phylon building is pretty easy.
Just install Eclipse and import the project as described here:
https://github.com/M66B/XPrivacy#contributing

If you need help, it is just one question away.

Phylon added a commit to Phylon/XPrivacy that referenced this pull request Feb 19, 2014
Making German Translation available for upcoming stable release (from pending pull request issue M66B#1344).
Phylon added a commit to Phylon/XPrivacy that referenced this pull request Feb 19, 2014
Making French Translation available for upcoming stable release (from pending pull request issue M66B#1344).
@Phylon
Copy link
Contributor Author

Phylon commented Feb 26, 2014

Quote:"You could install 1.11 stable, set some restriction and then migrate this restriction by installing 1.99.x"

I don't know how to build 1.11. I cannot find a tag for 1.11 in the repo. Also, I have not been able to get the "app_notxposed" message. I both disabled and uninstalled Xposed, but I only got "Privacy service not found...", when I opened XPrivacy. When I installed an older Xposed version, I got the same screen. Xprivacy could not be activated in the older Xposed installer, which is indicating that a newer Xposed bridge version is needed. Do you have some hints for me?

@M66B
Copy link
Owner

M66B commented Feb 26, 2014

There is no tag for 1.11, so that is right. I have only recently started using tags.
Leave it like it is, if you have done what you could, I will just release a test release after the next stable to get feedback. It isn't simply possible to test anything anyway.

@M66B
Copy link
Owner

M66B commented Mar 6, 2014

I have decided not to merge this for all languages. Everything works okay and this change has the risk of breaking things.

Nevertheless this is a good change, so my proposal is to make a merge request for the default English texts only and to provide a script in the tools folder, so that each translator can run this when updating a translation (or I will do this after an update has been provided).

@M66B M66B closed this Mar 6, 2014
@Phylon
Copy link
Contributor Author

Phylon commented Mar 6, 2014

If this is the way you wish to go, I can do that. At least, I am now well trained in resolving language file merge conflicts....
Shall I also do a cleanup and remove the one positional format that already somehow found its way into the translations?

@M66B
Copy link
Owner

M66B commented Mar 6, 2014

Yes, please

@Phylon
Copy link
Contributor Author

Phylon commented Mar 6, 2014

Cleanup done as a part of issue #1446.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants