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.

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

useMove + pokemon affix localization #1276

Merged
merged 14 commits into from
Jun 6, 2024

Conversation

laeticiapierre
Copy link
Contributor

@laeticiapierre laeticiapierre commented May 23, 2024

Issue #1274

EDIT 05/27:
ENG
Capture d’écran 2024-05-27 à 17 13 48
Capture d’écran 2024-05-27 à 17 13 54

FR
Capture d’écran 2024-05-27 à 17 12 53
Capture d’écran 2024-05-27 à 17 13 01

Greenlamp2
Greenlamp2 previously approved these changes May 23, 2024
@laeticiapierre laeticiapierre marked this pull request as ready for review May 23, 2024 08:15
@CodeTappert
Copy link
Collaborator

Could you please make it so that both of them could be suffixes as well?

German for example uses: "Glumanda (Wild)" instead of "Wildes Glumanda" (Wild is the "prefix").

Same with the foe one

@laeticiapierre
Copy link
Contributor Author

Could you please make it so that both of them could be suffixes as well?

German for example uses: "Glumanda (Wild)" instead of "Wildes Glumanda" (Wild is the "prefix").

Same with the foe one

I've put pokemonPrefix as a parameter name because it's the method name but you can place it wherever you like, feel free to check the french file, it's used that way

@Dakurei
Copy link
Collaborator

Dakurei commented May 23, 2024

As it's not at the beginning of a sentence in French, it's a suffix rather than a prefix, so there's no need to capitalize it.
Besides being ugly, it's incorrect 😅

@CodeTappert
Copy link
Collaborator

Could you please make it so that both of them could be suffixes as well?
German for example uses: "Glumanda (Wild)" instead of "Wildes Glumanda" (Wild is the "prefix").
Same with the foe one

I've put pokemonPrefix as a parameter name because it's the method name but you can place it wherever you like, feel free to check the french file, it's used that way

Yeah i saw that. So pokemonPrefix is either wildPrefix or foePrefix? Am i understanding this correctly?

@laeticiapierre
Copy link
Contributor Author

laeticiapierre commented May 23, 2024

As it's not at the beginning of a sentence in French, it's a suffix rather than a prefix, so there's no need to capitalize it. Besides being ugly, it's incorrect 😅

We could easily fix this by updating the french file and replacing Sauvage with sauvage (same for Ennemi) but traduction is not done everywhere at the moment, there are some places left where we would have "sauvage Tortank [...]" as a sentence and I think it's better to have a capitalized letter at the start of it

EDIT: I found some time to do a bigger rework and the problem is no longer present

@CodeTappert
Copy link
Collaborator

CodeTappert commented May 23, 2024

German translation. Source (Pokemon Scarlet)

  "wildPokemonPrefix": " (wild)",
  "foePokemonPrefix": " (Gegner)",
  "useMove": "{{pokemonName}}{{pokemonPrefix}} setzt {{moveName}} ein!"

@CodeTappert
Copy link
Collaborator

German translation. Source (Pokemon Scarlet)

  "wildPokemonPrefix": " (wild)",
  "foePokemonPrefix": " (Gegner)",
  "useMove": "{{pokemonName}}{{pokemonPrefix}} setzt {{moveName}} ein!"

Just quick update. I updated this again just now so it works even when the prefix is set to an empty string (which i assume is done for our own Pokemon?).

Just added a space in the prefix itself but removed the one in the useMove string

@Greenlamp2 Greenlamp2 added the Localization Provides or updates translation efforts label May 23, 2024
@Adri1
Copy link
Contributor

Adri1 commented May 23, 2024

As "Wild" and "Foe" can be placed either before or after depending on the language (as demonstarted) my opinion is to rename it an "affix". Affix being a the dedicated (and more generalist) term to talk about any addition to a word, either placed before or after it, among others.
https://en.wikipedia.org/wiki/Affix
https://fr.wikipedia.org/wiki/Affixe

Or you can also simply call it an adjective, as "wild" and "foe" are qualifiers of the Pokémon they refer to.

Second opinon, i'd also suggest to add a line beark after "utilise" in the French sentence to put the name of the move below, as it is in English and French versions of older Pokémon games

@bennybroseph bennybroseph marked this pull request as draft May 23, 2024 12:06
@wuzhaoqi1015
Copy link

Has this issue been merged?

@CodeTappert
Copy link
Collaborator

Has this issue been merged?

Not yet. The creator of the issue has not adressed the latest comments or made changes suggestet. It is a "Draft". So we wait

# Conflicts:
#	src/locales/en/battle.ts
#	src/locales/es/battle.ts
#	src/locales/it/battle.ts
#	src/locales/pt_BR/battle.ts
#	src/locales/zh_CN/battle.ts
#	src/messages.ts
#	src/phases.ts
@laeticiapierre laeticiapierre changed the title useMove + pokemonPrefix localization useMove + pokemon affix localization May 27, 2024
@laeticiapierre laeticiapierre marked this pull request as ready for review May 27, 2024 15:51
@CodeTappert
Copy link
Collaborator

Could you please provide screenshots of the german version? Would love to see if it looks correct

@laeticiapierre
Copy link
Contributor Author

Could you please provide screenshots of the german version? Would love to see if it looks correct

Capture d’écran 2024-05-28 à 12 56 10 Capture d’écran 2024-05-28 à 12 56 58

@CodeTappert
Copy link
Collaborator

Could you please provide screenshots of the german version? Would love to see if it looks correct

Capture d’écran 2024-05-28 à 12 56 10 Capture d’écran 2024-05-28 à 12 56 58

Thank. You. Looks very good!

@brain-frog
Copy link
Collaborator

Sorry this is a product of the delay in further review but since korean is now in locales can you please add that to this PR

Copy link
Collaborator

@brain-frog brain-frog left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, a few things to fix before we can approve

}

export function getPokemonPrefix(pokemon: Pokemon): string {
let prefix: string;
export function getPokemonNameWithAffix(pokemon: Pokemon): string {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add documentation for this and the above method, reference docs/comments.md for a guide

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done 👍🏻 (and korean)

Comment on lines 59 to 61
"wildPokemonWithAffix": "Wild {{pokemonName}}",
"foePokemonWithAffix": "Foe {{pokemonName}}",
"useMove": "{{pokemonNameWithAffix}} used {{moveName}}!"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"wildPokemonWithAffix": "Wild {{pokemonName}}",
"foePokemonWithAffix": "Foe {{pokemonName}}",
"useMove": "{{pokemonNameWithAffix}} used {{moveName}}!"
"wildPokemonWithAffix": "야생 {{pokemonName}}",
"foePokemonWithAffix": "상대 {{pokemonName}}",
"useMove": "{{pokemonNameWithAffix}} {{moveName}}!"

translated by the official translation(VIII, IX gen)

# Conflicts:
#	src/locales/de/battle.ts
#	src/locales/en/battle.ts
#	src/locales/es/battle.ts
#	src/locales/fr/battle.ts
#	src/locales/it/battle.ts
#	src/locales/pt_BR/battle.ts
#	src/locales/zh_CN/battle.ts
#	src/locales/zh_TW/battle.ts
# Conflicts:
#	src/locales/es/weather.ts
@flx-sta
Copy link
Collaborator

flx-sta commented Jun 4, 2024

@laeticiapierre please resolve the merge conflicts

# Conflicts:
#	src/locales/ko/weather.ts
#	src/locales/pt_BR/battle.ts
@bennybroseph bennybroseph merged commit f53dce4 into pagefaultgames:main Jun 6, 2024
3 checks passed
frutescens pushed a commit to frutescens/pokerogue that referenced this pull request Jun 10, 2024
* useMove + pokemonPrefix localization

* Rename prefix to affix + line break fr

* getPokemonAffix to getPokemonNameWithAffix + remove space + replace

* Better getPokemonNameWithAffix switch

* Ko locale + fix es locale

* Doc getPokemonNameWithAffix + getPokemonMessage + fix

* Ko translate / missing weather changes

* Fix conflicts getPokemonPrefix

---------

Co-authored-by: Benjamin Odom <bennybroseph@gmail.com>
Korwai pushed a commit to Korwai/pokerogue that referenced this pull request Jun 14, 2024
* useMove + pokemonPrefix localization

* Rename prefix to affix + line break fr

* getPokemonAffix to getPokemonNameWithAffix + remove space + replace

* Better getPokemonNameWithAffix switch

* Ko locale + fix es locale

* Doc getPokemonNameWithAffix + getPokemonMessage + fix

* Ko translate / missing weather changes

* Fix conflicts getPokemonPrefix

---------

Co-authored-by: Benjamin Odom <bennybroseph@gmail.com>
SavGRY pushed a commit to SavGRY/pokerogue that referenced this pull request Jun 16, 2024
* useMove + pokemonPrefix localization

* Rename prefix to affix + line break fr

* getPokemonAffix to getPokemonNameWithAffix + remove space + replace

* Better getPokemonNameWithAffix switch

* Ko locale + fix es locale

* Doc getPokemonNameWithAffix + getPokemonMessage + fix

* Ko translate / missing weather changes

* Fix conflicts getPokemonPrefix

---------

Co-authored-by: Benjamin Odom <bennybroseph@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Localization Provides or updates translation efforts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants