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

[Localization] Implement pokemon forms localization #1685

Merged
merged 82 commits into from
Jul 7, 2024

Conversation

Kiriox94
Copy link
Contributor

@Kiriox94 Kiriox94 commented Jun 1, 2024

If you want to contribute, please open a PULL REQUEST on my branch

What are the changes?

Localization of pokemon forms in the starter selection menu and in battles

Why am I doing these changes?

So that the whole game can be localized in one day, and also because it was requested here #339

What did change?

The strings for displaying forms are now retrieved from src/locales/{your language}/pokemon-form.ts and no longer raw in the code.

Checklist

  • There is no overlap with another PR?
  • The PR is self-contained and cannot be split into smaller PRs?
  • Have I provided a clear explanation of the changes?
  • Have I tested the changes (manually)?
    • Are all unit tests still passing? (npm run test)

@Adri1
Copy link
Contributor

Adri1 commented Jun 1, 2024

I created a PR to your branch with French traslations

@Tempo-anon Tempo-anon added the Localization Provides or updates translation efforts label Jun 1, 2024
Update French pokemon-form.ts
src/locales/ko/pokemon-form.ts Outdated Show resolved Hide resolved
src/locales/ko/pokemon-form.ts Outdated Show resolved Hide resolved
src/locales/ko/pokemon-form.ts Outdated Show resolved Hide resolved
src/locales/ko/pokemon-form.ts Outdated Show resolved Hide resolved
src/locales/ko/pokemon-form.ts Outdated Show resolved Hide resolved
Kiriox94 and others added 5 commits June 1, 2024 19:35
Co-authored-by: returntoice <dieandbecome@gmail.com>
Co-authored-by: returntoice <dieandbecome@gmail.com>
Co-authored-by: returntoice <dieandbecome@gmail.com>
Co-authored-by: returntoice <dieandbecome@gmail.com>
Co-authored-by: returntoice <dieandbecome@gmail.com>
@Kiriox94
Copy link
Contributor Author

Kiriox94 commented Jun 1, 2024

Thank you for your contribution @returntoice, next time if you could go through a pull request, it would be easier

Copy link
Contributor

@returntoice returntoice left a comment

Choose a reason for hiding this comment

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

Sorry I am not that familiar with the Github system. Is is right that I'd have been better off making a new PR and merging with this PR?

@Kiriox94
Copy link
Contributor Author

Kiriox94 commented Jun 1, 2024

Sorry I am not that familiar with the Github system. Is is right that I'd have been better off making a new PR and merging with this PR?

Yes, making a pull request on my branch would have made it possible to add all the modifications at once, but the result is the same.

@Adri1
Copy link
Contributor

Adri1 commented Jun 1, 2024

I just pushed a new PR tout your branch to correct a typo in French

Kiriox94 and others added 6 commits June 1, 2024 20:03
like rockruff of OwnTempo case, it is froakie, not greninja.
Power construct is more important information
Switch its position to 50% or 10% to avoid overlapping with the sprite
@CodeTappert
Copy link
Collaborator

Could you please provide some screenshots about where they are used? I am about to provide a PR with the german localization but some form names depend on where they are shown.

@CodeTappert
Copy link
Collaborator

Could you please provide some screenshots about where they are used? I am about to provide a PR with the german localization but some form names depend on where they are shown.

For example
image

needs to be
image

in german.

But could also be written as for example "Pikachu (Rocker)"

@CodeTappert
Copy link
Collaborator

CodeTappert commented Jun 2, 2024

You are missing some forms:

  • Deoxys Forms
  • Cherrim Forms
  • Origin Forms for Palkia, Dialga, Girantina
  • Shaymins alternative form
  • (if needed the arceus forms)
  • Darmanitan trance mode
  • The animal spirt forms of Tornadus, Thundurus, Landorus and Enamorus
  • Kyurem (White/Black)
  • Keldeo Resolutform
  • Meloetta Dancingform
  • Genesect: Schock Drive, Burn Drive, ChillDrive, Douse Drive
  • Furfrou (Natural Form)
  • Aegislash (blade/shieldform)
  • pumpkaboo (Medium)
  • eiscue iceform
  • Sinistcha Unremarkable Form. Masterpiece Form
  • No localizatiotion for the forms of Lycanroc
  • Hoopa (Confined/Unbound)
  • Mimikyu (Disguised/Busted)
  • Wishiwashi: Schoolform/Soloform
  • Silvally Forms
  • Necrozma: Fusion with Solgaleo, Fusion with Lunala, Ultra Necrozma
  • Cramorant: Gulping Form/Gorging Form
  • Morpeko: Full-Belly Mode, Hangry Mode
  • Zacian: Hero of Many Battles / Crowned Sword
  • Zamazenta: Hero of Many Battles / Crowned Shield
  • Calyrex: Ice Rider Calyrex / Shadow Rider Carylex
  • Palafin: Heroform
  • Ogerpon: Teal Mask/Wellspring Mask/Hearthflame Mask/Cornerstone Mask
  • Terapagos: Terastal Form/Stellarform
  • Partner Evee, Partner Pikachu
  • Pikachu with the Caps
  • Toxtricity: Highform/Lowform
  • Urshifu: Rapid Style Strike, Single Style Strike
  • Ursaluna: Bloodmoon form
    Source (in german): https://www.pokewiki.de/Pok%C3%A9mon_mit_verschiedenen_Formen

@CodeTappert
Copy link
Collaborator

German PR is here: Kiriox94#4

Copy link
Contributor

@returntoice returntoice left a comment

Choose a reason for hiding this comment

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

for canceling

@Kiriox94
Copy link
Contributor Author

Why does everyone cancel their review?

@EnochG1
Copy link
Contributor

EnochG1 commented Jun 28, 2024

Maybe they approve after you merge main branch.
You can do it if you approve and merge my PR.
Kiriox94#8

@Kiriox94
Copy link
Contributor Author

Yes, I'm just trying it out on my end to make sure everything works, then I'll merge your pr

Try to merge 'main' branch in your branch
@EnochG1
Copy link
Contributor

EnochG1 commented Jun 28, 2024

@40chyan
@returntoice
@josericardo-fo
@flx-sta
@InnocentGameDev
@Adri1
@bennybroseph

Hi,
I and Kiriox94 resolved conflict and merge 'main' into branch.
Please check and approve if 'File changed' has no problem. (When you have a time.)

Copy link
Contributor

@mercurius-00 mercurius-00 left a comment

Choose a reason for hiding this comment

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

fix typo

src/locales/zh_CN/pokemon-form.ts Outdated Show resolved Hide resolved
@flx-sta
Copy link
Collaborator

flx-sta commented Jun 28, 2024

[...]
@ flx-sta
[...]
Hi,
I and Kiriox94 resolved conflict and merge 'main' into branch.
Please check and approve if 'File changed' has no problem. (When you have a time.)

I wasn't involved at all in this ticket, so I'll leave you guys at it

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
Copy link
Collaborator

@AsdarDevelops AsdarDevelops left a comment

Choose a reason for hiding this comment

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

Reverted some changes I made to the Vivillion's forms. Otherwise "ES" looks good.

@EnochG1
Copy link
Contributor

EnochG1 commented Jul 6, 2024

@Kiriox94
Could you apply InnocentGameDev's suggestion?

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>
@f-fsantos
Copy link
Collaborator

@Kiriox94 can you confirm that both the UI and all the keys were tested?

@Kiriox94
Copy link
Contributor Author

Kiriox94 commented Jul 7, 2024

@Kiriox94 can you confirm that both the UI and all the keys were tested?

Yes

@EnochG1
Copy link
Contributor

EnochG1 commented Jul 7, 2024

@f-fsantos
I checked code you said and there's no problem.
The reason for removing form.formName is that
it was separated by each form (for localization of form name also, including position of name.)

// As-is
      case SpeciesFormKey.MEGA:
      case SpeciesFormKey.PRIMAL:
      case SpeciesFormKey.ETERNAMAX:
        return `${form.formName} ${this.name}`; // this code covers 3 forms
      case SpeciesFormKey.MEGA_X:
        return `Mega ${this.name} X`;
      case SpeciesFormKey.MEGA_Y:
        return `Mega ${this.name} Y`;
      default:
        if (form.formKey.indexOf(SpeciesFormKey.GIGANTAMAX) > -1) {
          return `G-Max ${this.name}`;
        }
      }
// TO-BE
      case SpeciesFormKey.MEGA: // each form name separated
        return i18next.t("pokemonForm:mega", {pokemonName: this.name});
      case SpeciesFormKey.PRIMAL:
        return i18next.t("pokemonForm:primal", {pokemonName: this.name});
      case SpeciesFormKey.ETERNAMAX:
        return i18next.t("pokemonForm:eternamax", {pokemonName: this.name});
      case SpeciesFormKey.MEGA_X:
        return i18next.t("pokemonForm:megax", {pokemonName: this.name});
      case SpeciesFormKey.MEGA_Y:
        return i18next.t("pokemonForm:megay", {pokemonName: this.name});
      default:
        if (form.formKey.indexOf(SpeciesFormKey.GIGANTAMAX) > -1) {
          return i18next.t("pokemonForm:gigantamax", {pokemonName: this.name});
        }
      }

Here's my test screenshot in this branch. (English / Franch)

En Fr
image image
image image

@EnochG1
Copy link
Contributor

EnochG1 commented Jul 7, 2024

@f-fsantos
And I tested this part, too.

        const speciesName = Species[species.speciesId].toLowerCase().split("_");
        for (let i = 1; i < speciesName?.length; i++) {
          speciesName[i] = speciesName[i].charAt(0).toUpperCase() + speciesName[i].substring(1);
        }

        if (species.speciesId === Species.ARCEUS) {
          this.pokemonFormText.setText(i18next.t(`pokemonInfo:Type.${formText?.join("").toUpperCase()}`));
        } else {
          this.pokemonFormText.setText(formText?.join("") ? i18next.t(`pokemonForm:${speciesName.join("")}${formText.join("")}`) : "");
        }
En Fr
image image

@f-fsantos f-fsantos merged commit 41c05bf into pagefaultgames:main Jul 7, 2024
5 checks passed
OrangeRed added a commit to OrangeRed/pokerogue that referenced this pull request Jul 7, 2024
f-fsantos pushed a commit that referenced this pull request Jul 7, 2024
* Revert "modify wrong config path (ko) (#2895)"

This reverts commit 40a31b1.

* Revert "[Localization] Implement pokemon forms localization (#1685)"

This reverts commit 41c05bf.
case SpeciesFormKey.MEGA_X:
return `Mega ${this.name} X`;
return i18next.t("pokemonForm:megax", {pokemonName: this.name});
Copy link
Collaborator

Choose a reason for hiding this comment

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

change to megaX

case SpeciesFormKey.MEGA_Y:
return `Mega ${this.name} Y`;
return i18next.t("pokemonForm:megay", {pokemonName: this.name});
Copy link
Collaborator

Choose a reason for hiding this comment

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

change to megaY

@CodeTappert
Copy link
Collaborator

CodeTappert commented Jul 7, 2024

Add:

  • deoxysNormal
  • shayminLand
  • giratinaAltered
  • tornadusIncarnate
  • thundurusIncarnate
  • landorusIncarnate
  • keldeoOrdinary
  • meloettaAria
  • morpekoFullBelly
  • zacianHeroOfManyBattles
  • zamazentaHeroOfManyBattles
  • enamorusIncarnate
  • miraidonUltimateMode
  • miraidonLowPowerMode
  • miraidonDriveMode
  • miraidonAquaticMode
  • miraidonGlideMode
  • koraidonApexBuild
  • koraidonLimitedBuild
  • koraidonSprintingBuild
  • koraidonSwimmingBuild
  • koraidonGlidingBuild

@@ -1,3 +1,4 @@
import { pokemonForm } from "../es/pokemon-form";
Copy link
Collaborator

Choose a reason for hiding this comment

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

change to

import { pokemonForm } from "./pokemon-form";

Tempo-anon added a commit that referenced this pull request Jul 8, 2024
* Remove screen inversion if move animations are off

* [Sprite] Shiny Minior Fixes (#2876)

* [Sprite] Shiny Meteor Minior not in shell

Taken from non-shiny sprite and animation.

* [Sprite] Back shiny Meteor Minior not in shell

Taken from non-shiny sprite and animation.

* [Sprite] Shiny exp Minior Cores wrong colours

* [Sprite] Shiny exp Minior Core backs wrong colours

* Change some voucher icons in achievements (#2616)

* [Bug] Fix hard press bp and pp (#2441)

* Fix hard press bp and pp

* Hard Press should have a max bp of 100

* Fix typo for acc

* Add test

* [Localization] Implement pokemon forms localization (#1685)

* Implement Pokemon forms localization

* Update French pokemon-form.ts

* Update French pokemon-form.ts

* Update pokemon-form.ts

* Add battle forms korean translation from returntoice

Co-authored-by: returntoice <dieandbecome@gmail.com>

* Add cosplay forms korean translation from returntoice

Co-authored-by: returntoice <dieandbecome@gmail.com>

* Add pichu form korean translation from returntoice

Co-authored-by: returntoice <dieandbecome@gmail.com>

* Add castform forms korean translation by returntoice

Co-authored-by: returntoice <dieandbecome@gmail.com>

* Add remaining forms korean translation by returntoice

Co-authored-by: returntoice <dieandbecome@gmail.com>

* French typo corrections pokemon-form.ts

* Update Korean pokemon-form.ts

* Modify froakiBattleBond

like rockruff of OwnTempo case, it is froakie, not greninja.

* Modify zygardePc

Power construct is more important information
Switch its position to 50% or 10% to avoid overlapping with the sprite

* Modify mispelling

* Added german forms

* Changed Gigadynamax and Unendynamax so it fits at all

* Add partner pikachu and eevee form localization

* Add mimikyu forms localization

* Partner Pikachu, Partner Evoli und Mimikyu Formen hinzugefügt

* Update pokemon-form.ts

* Update partners

* Fix conflicts

* Fix useless ? by flx-sta

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

* Fix switch use by flx-sta

* Fix conflicts

* Please work !!!!!!!

* Update src/locales/fr/pokemon-form.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* Update src/locales/fr/pokemon-form.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* Add pt_br primal localization

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Add pt_br pikachu localization

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Add pt_br castform localization

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Add pt_br 3g localization

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Add zh_cn localization

Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>

* Add pt_br other localization

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Add es castform localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es burmy localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es shellos localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es rotom localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es basculin localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es deerling localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es froakie localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es scatterbug localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es furfrou localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es xerneas localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es zygarde localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es pumpkaboo localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es flabebe localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es oricorio localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es minior localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es magearna localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es marshadow localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es sinistea ocalization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es eiscue localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es indeedee localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es rockruff localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es mimikyu localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es zarude localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es squawkabilly localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es tatsugiri localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es gimmighoul localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es poltchageit localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es paldeaTauros localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es primal localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es pikachu localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Add es partner localization

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

* Fix typedocs error

* Fix typedocs error

* cn form prefix added

Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>

* Fix german translate error

* Fix typo Zh_CN

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Update src/locales/es/pokemon-form.ts

Co-authored-by: InnocentGameDev <asdargmng@gmail.com>

---------

Co-authored-by: Lugiad <adrien.grivel@hotmail.fr>
Co-authored-by: returntoice <dieandbecome@gmail.com>
Co-authored-by: Mr.WaterT <water.t.works@gmail.com>
Co-authored-by: MrWaterT <87186129+MrWaterT@users.noreply.github.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: Benjamin Odom <bennybroseph@gmail.com>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
Co-authored-by: InnocentGameDev <asdargmng@gmail.com>
Co-authored-by: EnochG1 <enoch.jwsong@gmail.com>
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* fix description of REVIVER_SEED to contain direct-hit detail (#2813)

* fix en & de description of REVIVER_SEED. add todo for other languages

* Update src/locales/fr/modifier-type.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* Update src/locales/pt_BR/modifier-type.ts

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Update src/locales/zh_CN/modifier-type.ts

Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>

* Update src/locales/zh_TW/modifier-type.ts

Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>

* remove trailing spaces in zh_TW/_CN

* Update src/locales/de/modifier-type.ts

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>

* Update src/locales/de/modifier-type.ts

* Update src/locales/es/modifier-type.ts

Co-authored-by: ReneGV <renegv94@gmail.com>

* Update src/locales/ko/modifier-type.ts

Co-authored-by: Enoch <enoch.jwsong@gmail.com>

* remove trailing spaces

* Update src/locales/it/modifier-type.ts

---------

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: Tempoanon <163687446+Tempo-anon@users.noreply.github.com>
Co-authored-by: ReneGV <renegv94@gmail.com>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>

* modify wrong config path (ko) (#2895)

* Revert (#2895) and (#1685) (#2896)

* Revert "modify wrong config path (ko) (#2895)"

This reverts commit 40a31b1.

* Revert "[Localization] Implement pokemon forms localization (#1685)"

This reverts commit 41c05bf.

* This should prevent gym leaders appear as doubles (marnie & piers) when they arent fixed battles

---------

Co-authored-by: Temps Ray <temps.ray@gmail.com>
Co-authored-by: chaosgrimmon <31082757+chaosgrimmon@users.noreply.github.com>
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Co-authored-by: Tempoanon <163687446+Tempo-anon@users.noreply.github.com>
Co-authored-by: Kiriox <66013753+Kiriox94@users.noreply.github.com>
Co-authored-by: Lugiad <adrien.grivel@hotmail.fr>
Co-authored-by: returntoice <dieandbecome@gmail.com>
Co-authored-by: Mr.WaterT <water.t.works@gmail.com>
Co-authored-by: MrWaterT <87186129+MrWaterT@users.noreply.github.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
Co-authored-by: Benjamin Odom <bennybroseph@gmail.com>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
Co-authored-by: InnocentGameDev <asdargmng@gmail.com>
Co-authored-by: EnochG1 <enoch.jwsong@gmail.com>
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
Co-authored-by: ReneGV <renegv94@gmail.com>
Co-authored-by: Dmitriy K <kagno.dmitriy@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.