Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: duplicated HTR symbol #654

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
+87 −84
Open

fix: duplicated HTR symbol #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
48e3ba7
fix: duplicated HTR symbol
tuliomir Feb 14, 2025
deadf5c
chore: updates translations
tuliomir Feb 15, 2025
11dfa35
docs: clarifies translation commands
tuliomir Feb 15, 2025
f55b5e8
fix: translation line break
tuliomir Feb 15, 2025
7d186e1
fix: fuzzy parameter
tuliomir Feb 18, 2025
4eebe07
fix: dynamic native token symbol
tuliomir Feb 26, 2025
35fa338
docs: improves translation instructions
tuliomir Feb 26, 2025
c049e86
Merge branch 'master' into fix/duplicated-symbol
tuliomir Feb 26, 2025
2cf6bcf
fix: lint
tuliomir Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,14 @@ To install Flipper, [download it on the official website](https://fbflipper.com/

We use the `ttag` lib for i18n. Check out the docs [here](https://ttag.js.org/docs/quickstart.html).

Run `npm run locale-update-pot` to update the pot file (`locale/texts.pot`).
Run `npm run locale-update-pot` to update the root "pot" file (`locale/texts.pot`).

Run `msgmerge pt-br/texts.po texts.pot -o pt-br/texts.po` to merge a pot file with a po file.
Navigate to the `/locale` folder and execute the following commands:
For each of the languages, run `msgmerge [lang]/texts.po texts.pot -o [lang]/texts.po` to merge the root pot file with a localized po file. For example, for the Portuguese language, run `msgmerge pt-br/texts.po texts.pot -o pt-br/texts.po`.

Finally, run `make i18n` to compile all po files to json files.
After each merged file, edit it and look for `fuzzy, javascript-format` messages. Those indicate translations that were executed automatically and need to be reviewed. Remove the whole `fuzzy` line and adjust the translation if necessary.

Finally, navigate back to the root folder and run `make i18n` to compile all po files to json files.

## License

Expand Down
39 changes: 19 additions & 20 deletions locale/da/texts.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ msgstr "Ugyldig adresse"
#. *
#. * @example
#. * You have received 10 T2, 5 T1 and 2 other token on a new transaction.
#.
#.
#: src/workers/pushNotificationHandler.js:92
#, javascript-format
msgid ""
Expand All @@ -83,7 +83,7 @@ msgstr[1] ""
#. *
#. * @example
#. * You have received 10 T2 and 5 T1 on a new transaction.
#.
#.
#: src/workers/pushNotificationHandler.js:105
#, javascript-format
msgid ""
Expand All @@ -94,7 +94,7 @@ msgstr ""
#. *
#. * @example
#. * You have received 10 T2 on a new transaction.
#.
#.
#: src/workers/pushNotificationHandler.js:113
msgid "You have received ${ _firstToken2 } on a new transaction."
msgstr ""
Expand Down Expand Up @@ -222,9 +222,8 @@ msgid "Deposit:"
msgstr "Indsæt:"

#: src/screens/CreateTokenAmount.js:144
#, javascript-format
msgid "You have ${ amountAvailableText } HTR available"
msgstr "Du har ${ amountAvailableText } HTR tilgængelig"
msgid "You have ${ amountAvailableText } available"
msgstr "Du har ${ amountAvailableText } tilgængelig"

#: src/screens/CreateTokenAmount.js:149 src/screens/CreateTokenName.js:64
#: src/screens/CreateTokenSymbol.js:84 src/screens/InitWallet.js:229
Expand Down Expand Up @@ -305,7 +304,7 @@ msgstr "TOKEN DETALJER"

#. *
#. * name {string} token name
#.
#.
#: src/screens/CreateTokenName.js:26
msgid "0/30 characters"
msgstr "0/30 tegn"
Expand Down Expand Up @@ -590,7 +589,7 @@ msgstr ""

#. *
#. * index {number} Selected index of the tab bar
#.
#.
#. eslint thinks routes is not used, but TabView uses it
#. eslint-disable-next-line react/no-unused-state
#: src/screens/Receive.js:31
Expand Down Expand Up @@ -1155,37 +1154,37 @@ msgstr ""
msgid "Error while trying to download Nano Contract transactions history."
msgstr ""

#: src/sagas/networkSettings.js:86
#: src/sagas/networkSettings.js:87
msgid "Custom Network Settings cannot be empty."
msgstr ""

#: src/sagas/networkSettings.js:93
#: src/sagas/networkSettings.js:94
msgid "explorerUrl should be a valid URL."
msgstr ""

#: src/sagas/networkSettings.js:100
#: src/sagas/networkSettings.js:101
msgid "explorerServiceUrl should be a valid URL."
msgstr ""

#: src/sagas/networkSettings.js:107
#: src/sagas/networkSettings.js:108
msgid "txMiningServiceUrl should be a valid URL."
msgstr ""

#: src/sagas/networkSettings.js:114
#: src/sagas/networkSettings.js:115
msgid "nodeUrl should be a valid URL."
msgstr ""

#: src/sagas/networkSettings.js:121
#: src/sagas/networkSettings.js:122
msgid "walletServiceUrl should be a valid URL."
msgstr ""

#: src/sagas/networkSettings.js:128
#: src/sagas/networkSettings.js:129
msgid "walletServiceWsUrl should be a valid URL."
msgstr ""

#. If we fall into this situation, the app should be killed
#. for the custom new network settings take effect.
#: src/sagas/networkSettings.js:280
#: src/sagas/networkSettings.js:281
msgid "Wallet not found while trying to persist the custom network settings."
msgstr ""

Expand All @@ -1205,21 +1204,21 @@ msgstr ""
msgid "Error loading the details of some tokens."
msgstr ""

#: src/sagas/wallet.js:781
#: src/sagas/wallet.js:793
msgid "Wallet is not ready to load addresses."
msgstr ""

#. This will show the message in the feedback content at SelectAddressModal
#: src/sagas/wallet.js:797
#: src/sagas/wallet.js:809
msgid "There was an error while loading wallet addresses. Try again."
msgstr ""

#: src/sagas/wallet.js:807
#: src/sagas/wallet.js:819
msgid "Wallet is not ready to load the first address."
msgstr ""

#. This will show the message in the feedback content
#: src/sagas/wallet.js:823
#: src/sagas/wallet.js:835
msgid "There was an error while loading first wallet address. Try again."
msgstr ""

Expand Down
39 changes: 19 additions & 20 deletions locale/pt-br/texts.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ msgstr "Endereço inválido"
#. *
#. * @example
#. * You have received 10 T2, 5 T1 and 2 other token on a new transaction.
#.
#.
#: src/workers/pushNotificationHandler.js:92
#, javascript-format
msgid ""
Expand All @@ -87,7 +87,7 @@ msgstr[1] ""
#. *
#. * @example
#. * You have received 10 T2 and 5 T1 on a new transaction.
#.
#.
#: src/workers/pushNotificationHandler.js:105
#, javascript-format
msgid ""
Expand All @@ -99,7 +99,7 @@ msgstr ""
#. *
#. * @example
#. * You have received 10 T2 on a new transaction.
#.
#.
#: src/workers/pushNotificationHandler.js:113
msgid "You have received ${ _firstToken2 } on a new transaction."
msgstr "Você recebeu ${ _firstToken2 } em uma nova transação."
Expand Down Expand Up @@ -230,9 +230,8 @@ msgid "Deposit:"
msgstr "Depósito:"

#: src/screens/CreateTokenAmount.js:144
#, javascript-format
msgid "You have ${ amountAvailableText } HTR available"
msgstr "Você tem ${ amountAvailableText } HTR disponíveis"
msgid "You have ${ amountAvailableText } available"
msgstr "Você tem ${ amountAvailableText } disponíveis"

#: src/screens/CreateTokenAmount.js:149 src/screens/CreateTokenName.js:64
#: src/screens/CreateTokenSymbol.js:84 src/screens/InitWallet.js:229
Expand Down Expand Up @@ -313,7 +312,7 @@ msgstr "DETALHES DO TOKEN"

#. *
#. * name {string} token name
#.
#.
#: src/screens/CreateTokenName.js:26
msgid "0/30 characters"
msgstr "0/30 caracteres"
Expand Down Expand Up @@ -605,7 +604,7 @@ msgstr ""

#. *
#. * index {number} Selected index of the tab bar
#.
#.
#. eslint thinks routes is not used, but TabView uses it
#. eslint-disable-next-line react/no-unused-state
#: src/screens/Receive.js:31
Expand Down Expand Up @@ -1183,37 +1182,37 @@ msgstr "Nano Contract não registrado."
msgid "Error while trying to download Nano Contract transactions history."
msgstr "Error ao fazer download do histórico de transações do Nano Contract."

#: src/sagas/networkSettings.js:86
#: src/sagas/networkSettings.js:87
msgid "Custom Network Settings cannot be empty."
msgstr "As Configurações de Rede não podem estar vazias."

#: src/sagas/networkSettings.js:93
#: src/sagas/networkSettings.js:94
msgid "explorerUrl should be a valid URL."
msgstr "explorerUrl deve ser uma URL válida."

#: src/sagas/networkSettings.js:100
#: src/sagas/networkSettings.js:101
msgid "explorerServiceUrl should be a valid URL."
msgstr "explorerServiceUrl deve ser uma URL válida."

#: src/sagas/networkSettings.js:107
#: src/sagas/networkSettings.js:108
msgid "txMiningServiceUrl should be a valid URL."
msgstr "txMiningServiceUrl deve ser uma URL válida."

#: src/sagas/networkSettings.js:114
#: src/sagas/networkSettings.js:115
msgid "nodeUrl should be a valid URL."
msgstr "nodeUrl deve ser uma URL válida."

#: src/sagas/networkSettings.js:121
#: src/sagas/networkSettings.js:122
msgid "walletServiceUrl should be a valid URL."
msgstr "walletServiceUrl deve ser uma URL válida."

#: src/sagas/networkSettings.js:128
#: src/sagas/networkSettings.js:129
msgid "walletServiceWsUrl should be a valid URL."
msgstr "walletServiceWsUrl deve ser uma URL válida."

#. If we fall into this situation, the app should be killed
#. for the custom new network settings take effect.
#: src/sagas/networkSettings.js:280
#: src/sagas/networkSettings.js:281
msgid "Wallet not found while trying to persist the custom network settings."
msgstr ""
"Wallet não encontrada ao persistir a configuração personalizada da rede."
Expand All @@ -1234,21 +1233,21 @@ msgstr "A wallet não está pronta ainda."
msgid "Error loading the details of some tokens."
msgstr "Ocorreu um erro durante o carregamento de detalhes de alguns tokens."

#: src/sagas/wallet.js:781
#: src/sagas/wallet.js:793
msgid "Wallet is not ready to load addresses."
msgstr "A wallet não está pronta para carregar os endereços."

#. This will show the message in the feedback content at SelectAddressModal
#: src/sagas/wallet.js:797
#: src/sagas/wallet.js:809
msgid "There was an error while loading wallet addresses. Try again."
msgstr "Ocorreu um erro ao carregar os endereços da wallet. Tente novamente."

#: src/sagas/wallet.js:807
#: src/sagas/wallet.js:819
msgid "Wallet is not ready to load the first address."
msgstr "A wallet não está pronta para carregar o primeiro endereço."

#. This will show the message in the feedback content
#: src/sagas/wallet.js:823
#: src/sagas/wallet.js:835
msgid "There was an error while loading first wallet address. Try again."
msgstr ""
"Ocorreu um erro ao carregar o primeiro endereço da wallet. Tente novamente."
Expand Down
Loading