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

[1.1.x] Polish language UTF8 #16141

Merged
merged 3 commits into from
Dec 11, 2019

Conversation

ArturNadolski
Copy link

Polish language in UTF8. It's based on English file so up-2-date
It has a lot more sentences translated then old version.
Need some "polishing" but it's good base to start.

Polish language in UTF8. It's based on English file.
Need some "polishing" but it's good base to start.
@boelle
Copy link
Contributor

boelle commented Dec 8, 2019

you need to push to MarlinFirmware:bugfix-2.0.x instead

@thinkyhead
Copy link
Member

thinkyhead commented Dec 8, 2019

@ArturNadolski
If you could repair the broken encoding of language_pl_utf8.h then I won't mind merging this change.

@thinkyhead thinkyhead changed the title Polish language UTF8 [1.1.x] Polish language UTF8 Dec 8, 2019
@ArturNadolski
Copy link
Author

My bad. I switched the files while uploading.

Uploading correct file
@boelle
Copy link
Contributor

boelle commented Dec 8, 2019

i changed the base to bugfix 2.0.x instead of bugfix 1.1.x

@boelle boelle changed the base branch from bugfix-1.1.x to bugfix-2.0.x December 8, 2019 15:55
@boelle boelle changed the title [1.1.x] Polish language UTF8 Polish language UTF8 Dec 8, 2019
@tpruvot
Copy link
Contributor

tpruvot commented Dec 8, 2019

no, i think 1.1.x one was broken :p

@boelle
Copy link
Contributor

boelle commented Dec 8, 2019

no, i think 1.1.x one was broken :p

yes but as i understand we only accept PR's to 2.0.x and not 1.1.x

@tpruvot
Copy link
Contributor

tpruvot commented Dec 8, 2019

i think all is utf8 in 2.x

@boelle
Copy link
Contributor

boelle commented Dec 8, 2019

yes but i still think PR's should be sent to bugfix 2.0.x and not 2.0

2.0 is just selected default if you dont make a selection

@boelle
Copy link
Contributor

boelle commented Dec 8, 2019

look at all other PR's they go to bugfix 2.0.x

@tpruvot
Copy link
Contributor

tpruvot commented Dec 8, 2019

the 2 is ok imo, its just the 1.1 branch file is not properly encoded as utf8

@ArturNadolski
Copy link
Author

M1.1 is still used by many ppl and my update is for this version.
I will try to prepare update for M2.0 but later.

@boelle
Copy link
Contributor

boelle commented Dec 8, 2019

M1.1 is still used by many ppl

but not updated anymore, 2.0.x is the way forward

@tpruvot
Copy link
Contributor

tpruvot commented Dec 8, 2019

hurry up, 2.0.1 is planned this evening... i think ;) passed the afternoon on french review

@boelle
Copy link
Contributor

boelle commented Dec 8, 2019

hurry up, 2.0.1 is planned this evening... i think ;)

yep, that is what i read on discord, but let's see, there is a bit of timezone difference between europe and US of A

@boelle
Copy link
Contributor

boelle commented Dec 8, 2019

@ArturNadolski

the consensus of the maintainers is that we aren't currently actively working on 1.x anymore, but anyone is still free to do so and submit a fix for a bug or even feature

so should this be changed back to 1.1.x ?

@ArturNadolski
Copy link
Author

@ArturNadolski

the consensus of the maintainers is that we aren't currently actively working on 1.x anymore, but anyone is still free to do so and submit a fix for a bug or even feature

so should this be changed back to 1.1.x ?

I didn't test it on 2.0 but I just take a look at source and there is Polish translation (I already commit file and pulled request some time ago). At 1.1 brach current Polish translation is very limited and there is no UTF8.
Please marge my files with 1.1 branch.

@boelle boelle changed the base branch from bugfix-2.0.x to bugfix-1.1.x December 8, 2019 20:33
@boelle
Copy link
Contributor

boelle commented Dec 8, 2019

done and sorry for the confusion, is the polish in 2.0.x ok?

@ArturNadolski
Copy link
Author

done and sorry for the confusion, is the polish in 2.0.x ok?

I think so. Maybe not 100% complete but very close.

@GMagician
Copy link
Contributor

@boelle
This is what @thinkyhead said:

If you could repair the broken encoding of language_pl_utf8.h then I won't mind merging this change.

He also change title to address specifically 1.1.x:

Polish language UTF8 [1.1.x] Polish language UTF8

so he is aware that this was for 1.1.x. I suspect there is an issue on 1.1.x that he likes to be fixed.

Maybe this fix may be an exception applied to bugfix-1.x release

@boelle boelle changed the title Polish language UTF8 [1.1.x] Polish language UTF8 Dec 10, 2019
@thinkyhead
Copy link
Member

thinkyhead commented Dec 11, 2019

so he is aware that this was for 1.1.x. I suspect there is an issue on 1.1.x that he likes to be fixed.

Yes. I consider the lack of proper UTF8 support for Polish a "missing piece" in the 1.1.x tree, and this PR is an obvious patch to deal with that deficit. So it is exactly the kind of patch I am personally happy to accept for the bugfix-1.1.x branch.

One less unwelcome surprise for Polish users of the 1.1.x patch pile.

In general: Anything that fills in a"missing piece" and doesn't alter the feature-set or config methodology of 1.1.x is acceptable as a patch for the bugfix branch.

@thinkyhead thinkyhead merged commit 5d270d2 into MarlinFirmware:bugfix-1.1.x Dec 11, 2019
AJMartel added a commit to AJMartel/Marlin that referenced this pull request Dec 22, 2019
TiagoJustino added a commit to TiagoJustino/Marlin that referenced this pull request Apr 2, 2020
* MarlinFirmware/1.1.x: (133 commits)
  Fix Z position after ABL bilinear G29 with fade (MarlinFirmware#17174)
  Change DUMMY_PID_VALUE to NAN (MarlinFirmware#17079)
  Disable integration testing
  Enable DUAL_NOZZLE_DUPLICATION_MODE (MarlinFirmware#16436)
  [1.1.x] Polish language UTF8 (MarlinFirmware#16141)
  Links for the "New Issue" page
  Add Korean language (MarlinFirmware#15918)
  [1.1.x] MKS_GEN_L_V2 controller (MarlinFirmware#15805)
  Update bug_report.md
  [1.1.x] Fix autostart w/out SD_DETECT_PIN (MarlinFirmware#15667)
  [1.1.x] RAMPS + Viki1 LCD compatibility (MarlinFirmware#15736)
  [1.1.x] Fix compiler warning (MarlinFirmware#15642)
  [1.1.x] Fix for G2/G3 rounding error (MarlinFirmware#15546)
  Let MINIPANEL use SW SPI if needed (MarlinFirmware#15246)
  Fix BLTouch debugging (MarlinFirmware#15232)
  Fix Creality bed thermistor
  Fix PT-BR strings (MarlinFirmware#15023)
  Fix #else extra tokens (MarlinFirmware#15013)
  [1.1.x] Autobuild formatting (MarlinFirmware#14858)
  [1.1.x] BLTouch 3.0 - 3.1 (MarlinFirmware#14839)
  ...
maz3max pushed a commit to maz3max/Marlin that referenced this pull request Aug 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants