search

damus-io / damus

iOS nostr client
GNU General Public License v3.0
2k stars 289 forks source link

Back-port Thai translations to 1.8 release branch #2213

Closed danieldaquino closed 6 months ago

danieldaquino commented 6 months ago

ISO 639-1 Language Code: th ISO 639-2 Language Code: tha

danieldaquino commented 6 months ago

Related to: https://github.com/damus-io/damus/pull/2201

danieldaquino commented 6 months ago

Commits of interest for back-porting:

c15f0454 Translate Localizable.stringsdict in th 43fc662b Translate Localizable.strings in th d2b7878d Translate InfoPlist.strings in th

danieldaquino commented 6 months ago

New commit of interest for cherry-picking/back-porting: 8133da82c1ce32be27eb4f7189dfefadf8908369

danieldaquino commented 6 months ago

@jb55 @alltheseas

I am getting non-trivial merge conflicts when cherry-picking https://github.com/damus-io/damus/commit/8133da82c1ce32be27eb4f7189dfefadf8908369 to the release branch

There seems to be enough localization changes (new translations in various languages, some changes to localization code, new localization definitions and configurations that the Thai translations may depend on, etc) that this back-port strategy might not be ideal.

I will try a new strategy. I will try cherry-picking every localization/translation change not present in 1.8, and see if that route works better.

danieldaquino commented 6 months ago

I will try a new strategy. I will try cherry-picking every localization/translation change not present in 1.8, and see if that route works better.

This worked without any merge conflicts. Now doing a quick smoke test

danieldaquino commented 6 months ago

Quickly ran the app in Thai and 3 other languages. Localization seems to be working as expected.

danieldaquino commented 6 months ago

The cherry-picked commits:

bb8dba6d Add Thai as a supported language c7d08026 Translate Localizable.stringsdict in th b47b3312 Translate Localizable.strings in th addd5cb7 Translate InfoPlist.strings in th 5ef9835e Translate Localizable.strings in zh_TW b8181452 Translate Localizable.strings in zh_HK 7b93b81e Translate Localizable.strings in zh_CN b590dab1 Translate Localizable.stringsdict in zh_TW b40db664 Translate Localizable.stringsdict in zh_HK 3662209e Translate Localizable.stringsdict in zh_CN 83c661be Translate Localizable.stringsdict in vi 77d8cdfd Translate Localizable.strings in vi fa2116e5 Translate Localizable.strings in es_ES 3137e3a4 Translate Localizable.strings in es_ES c31bee17 Translate Localizable.strings in es_ES 4fabc008 Translate Localizable.stringsdict in es_ES 968c3117 Translate Localizable.strings in de 6e44e57d Translate Localizable.strings in de 68e97ca2 Translate Localizable.strings in de 8b486583 Translate Localizable.stringsdict in de 709b7f3e Translate Localizable.strings in de 54c09a8a Translate Localizable.strings in nl 06154287 Translate Localizable.stringsdict in nl fc9af11f Fix localization issues 2cadded6 Add Finnish translations 066b257d Translate Localizable.strings in fa b193192b Translate Localizable.strings in ko f7187c23 Translate Localizable.strings in pl_PL

danieldaquino commented 6 months ago

@jb55 @tyiu, successfully back-ported localization changes from 1.9 (master) to the 1.8 release branch. Thai translations will be available on the upcoming 1.8 release!

Closing this ticket.