CityZenApp / AndroidApp

CityZen Android App, OpenStreetMap base-map
http://cityzenapp.co/
Mozilla Public License 2.0
75 stars 29 forks source link

Spanish language is replaced by duplicate Basque language #106

Closed huizache closed 5 years ago

huizache commented 5 years ago

Cityzen in spanish shows in basque. In https://github.com/CityZenApp/Android-Development/tree/master/CityZenApp/app/src/main/res

I see there are two basque languages values: values-eu Added translation using Weblate (Basque), commited 2 years ago and with proper basque "eu" iso language code

and

values-es-rEU Translated using Weblate (Basque), commited 10 months ago with an iso code I cannot find, but with "es-" for spanish

I am pretty sure this is the problem

kominoshja commented 5 years ago

@huizache Thank you for opening this issue! Can you confirm that CityZenApp/app/src/main/res/values-es-rEU/strings.xml is in Basque? If so we can move the content of that file over at CityZenApp/app/src/main/res/values-eu/strings.xml, which would then allow CityZenApp/app/src/main/res/values-es/strings.xml to load properly, since there won't be an es-rEu to confuse the code

huizache commented 5 years ago

@kominoshja it is in Basque, but I am not a basque speaker, so am not cualified to comment on quality of the translation.

What I did notice scan reading the es-rEu string is that it skips lines and misses a few words and phrases, thus giving the menu partialy in spanish for example.

I also scan read the eu string and it does not skip lines.

I would not recomend mixing es-rEu string with eu string until a Basque speaker reviews them. But removing the "es" from es-rEu does seem the right step.

kominoshja commented 5 years ago

@huizache I confirmed that https://github.com/CityZenApp/Android-Development/commit/4e97b4895acc55ec3904ba0b2940472c2322c84c fixes the issue. Please check so we can push to master

app-debug.apk

huizache commented 5 years ago

@kominoshja 4e97b48 is the basque translation. I cannot comment on basque translation. It is the proper basque ISO language code "values-eu".

kominoshja commented 5 years ago

Perfect. Merging tonight