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

Windows: Fix NSIS language encoding (use UTF-8) #2432

Merged
merged 2 commits into from
Sep 16, 2020

Conversation

misch7
Copy link
Member

@misch7 misch7 commented Sep 16, 2020

Fix NSIS language encoding (use UTF-8 instead of Win code pages)

The old conversion to specific code pages caused display errors (see issue #2393 for Russian).

Based on bin/l10n.sh, the files in this PR were converted to UTF-8 using iconv with the following parameters:

  iconv -f CP1252 -t UTF-8 -o German.nsh German.nsh
  iconv -f CP1252 -t UTF-8 -o Galician.nsh Galician.nsh
  iconv -f CP1253 -t UTF-8 -o Greek.nsh Greek.nsh
  iconv -f CP1250 -t UTF-8 -o Slovenian.nsh Slovenian.nsh
  iconv -f CP1257 -t UTF-8 -o Estonian.nsh Estonian.nsh
  iconv -f CP1252 -t UTF-8 -o Italian.nsh Italian.nsh
  iconv -f CP1252 -t UTF-8 -o PortugueseBR.nsh PortugueseBR.nsh
  iconv -f CP1252 -t UTF-8 -o Spanish.nsh Spanish.nsh
  iconv -f CP1252 -t UTF-8 -o Dutch.nsh Dutch.nsh
  iconv -f CP1252 -t UTF-8 -o Finnish.nsh Finnish.nsh
  iconv -f CP932 -t UTF-8 -o Japanese.nsh Japanese.nsh
  iconv -f CP1250 -t UTF-8 -o Slovak.nsh Slovak.nsh
  iconv -f CP1254 -t UTF-8 -o Turkish.nsh Turkish.nsh
  iconv -f CP1252 -t UTF-8 -o Norwegian.nsh Norwegian.nsh
  iconv -f CP852  -t UTF-8 -o Czech.nsh Czech.nsh

The installer script nextcloud.nsi in the client-building repo needs the following line (to be added on top):

  Unicode true

Remove unused and outdated NSIS Transifex settings

The last translation update from Transifex was done in 2017, so the scripts and settings were never used for Nextcloud.

This PR removes the unused scripts and "Auto-generated" comments in the translation files.

Some files have been modified over time either way and MSI will replace NSIS soon.

Changes required in client-building & add missing languages

After merging this PR, nextcloud/client-building#38 is required to be merged:

It modfies nextcloud.nsi to enable Unicode support.

Also adds the following translation files that were never referenced:

  Catalan
  Farsi
  French
  Hungarian
  Portuguese
  Russian
  SimpChinese
  Swedish
  Thai
  Ukrainian

@misch7 misch7 added this to the Desktop 3.0 milestone Sep 16, 2020
misch7 added a commit to nextcloud/client-building that referenced this pull request Sep 16, 2020
See: nextcloud/desktop#2432

The desktop PR needs to be merged first.

Signed-off-by: Michael Schuster <michael@schuster.ms>
misch7 added a commit to nextcloud/client-building that referenced this pull request Sep 16, 2020
The following translation files were never referenced:

  Catalan
  Farsi
  French
  Hungarian
  Portuguese
  Russian
  SimpChinese
  Swedish
  Thai
  Ukrainian

See desktop issue: nextcloud/desktop#2393

And desktop PR: nextcloud/desktop#2432

Signed-off-by: Michael Schuster <michael@schuster.ms>
@er-vin
Copy link
Member

er-vin commented Sep 16, 2020

/rebase

…ges)

The old conversion to specific code pages caused display errors (see issue #2393 for Russian).

Based on bin/l10n.sh, the files in this commit were converted to UTF-8 using iconv with the following parameters:

  iconv -f CP1252 -t UTF-8 -o German.nsh German.nsh
  iconv -f CP1252 -t UTF-8 -o Galician.nsh Galician.nsh
  iconv -f CP1253 -t UTF-8 -o Greek.nsh Greek.nsh
  iconv -f CP1250 -t UTF-8 -o Slovenian.nsh Slovenian.nsh
  iconv -f CP1257 -t UTF-8 -o Estonian.nsh Estonian.nsh
  iconv -f CP1252 -t UTF-8 -o Italian.nsh Italian.nsh
  iconv -f CP1252 -t UTF-8 -o PortugueseBR.nsh PortugueseBR.nsh
  iconv -f CP1252 -t UTF-8 -o Spanish.nsh Spanish.nsh
  iconv -f CP1252 -t UTF-8 -o Dutch.nsh Dutch.nsh
  iconv -f CP1252 -t UTF-8 -o Finnish.nsh Finnish.nsh
  iconv -f CP932 -t UTF-8 -o Japanese.nsh Japanese.nsh
  iconv -f CP1250 -t UTF-8 -o Slovak.nsh Slovak.nsh
  iconv -f CP1254 -t UTF-8 -o Turkish.nsh Turkish.nsh
  iconv -f CP1252 -t UTF-8 -o Norwegian.nsh Norwegian.nsh
  iconv -f CP852  -t UTF-8 -o Czech.nsh Czech.nsh

The installer script nextcloud.nsi in the client-building repo needs the following line (to be added on top):
  Unicode true

Signed-off-by: Michael Schuster <michael@schuster.ms>
The last translation update from Transifex was done in 2017, so the scripts and settings were never used for Nextcloud.

This commit removes the unused scripts and "Auto-generated" comments in the translation files.

Some files have been modified over time either way and MSI will replace NSIS soon.

Signed-off-by: Michael Schuster <michael@schuster.ms>
@nextcloud-desktop-bot
Copy link

AppImage file: Nextcloud-PR-2432-0e1e3a29cef6e4c2bda3a706a2960cfd846337b4-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@er-vin er-vin merged commit 5eba2e9 into master Sep 16, 2020
@er-vin er-vin deleted the fix/nsis-language-encoding branch September 16, 2020 07:13
@er-vin
Copy link
Member

er-vin commented Sep 16, 2020

/backport to stable-3.0

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.

None yet

3 participants