fix: Use the user configured UI language for PDFjs instead of browser language #1022

susnux · 2024-08-22T16:55:29Z

Closes fix: not showing localised strings using Chrome #1021
- We do not need to introduce duplicated translations, but just fix the configured language
Resolves Localisation is not working properly. #834

PDFjs uses the browser language by default, but users should have consistently the Nextcloud defined language. So now we set the PDFjs language to:

The Nextcloud configured language if supported
The unflavored version if supported (e.g. de instead of de-DE)
Fall back to browser UI language

We need 3 because if we set an unsupported language PDFjs will default to English, which is worse than the browser UI language.

Screen recording

My Nextcloud language: Spanish
My Browser UI: German

Before

Bildschirmaufnahme_20240822_190219.webm

After

Bildschirmaufnahme_20240822_183724.webm

susnux · 2024-08-22T17:01:44Z

/compile amend/

susnux · 2024-08-22T17:11:46Z

/backport to stable30

susnux · 2024-08-22T17:11:49Z

/backport to stable29

susnux · 2024-08-22T17:11:53Z

/backport to stable28

… language PDFjs uses the browser language by default, but users should have consistently the Nextcloud defined language. So now we set the PDFjs language to: 1. The Nextcloud configured language if supported 2. The unflavored version if supported (e.g. `de` instead of `de-DE`) 3. Fall back to browser UI language We need 3 because if we set an unsupported lanuage PDFjs will default to English, which is worse than the browser UI language. Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>

backportbot · 2024-08-23T13:02:44Z

The backport to stable28 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable28
git pull origin stable28

# Create the new backport branch
git checkout -b backport/1022/stable28

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 9078680f 6c641b2f

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/1022/stable28

Error: Failed to clone repository: Failed to checkout branches: error: Your local changes to the following files would be overwritten by checkout:
js/files_pdfviewer-main.js.map.license
js/files_pdfviewer-node_modules_nextcloud_dialogs_dist_chunks_index-CWnkpNim_mjs.js.map.license
js/files_pdfviewer-public.js.map.license
js/files_pdfviewer-vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-kaHdQqaz_mjs.js.map.license
js/files_pdfviewer-workersrc.js.map.license
Please commit your changes or stash them before you switch branches.
Aborting

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

backportbot · 2024-08-23T13:02:46Z

The backport to stable29 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable29
git pull origin stable29

# Create the new backport branch
git checkout -b backport/1022/stable29

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 9078680f 6c641b2f

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/1022/stable29

Error: Failed to clone repository: Failed to checkout branches: error: Your local changes to the following files would be overwritten by checkout:
js/files_pdfviewer-main.js.map.license
js/files_pdfviewer-node_modules_nextcloud_dialogs_dist_chunks_index-CWnkpNim_mjs.js.map.license
js/files_pdfviewer-public.js.map.license
js/files_pdfviewer-vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-kaHdQqaz_mjs.js.map.license
js/files_pdfviewer-workersrc.js.map.license
Please commit your changes or stash them before you switch branches.
Aborting

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

backportbot · 2024-08-23T13:02:49Z

The backport to stable30 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable30
git pull origin stable30

# Create the new backport branch
git checkout -b backport/1022/stable30

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 9078680f 6c641b2f

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/1022/stable30

Error: Failed to clone repository: Failed to checkout branches: error: Your local changes to the following files would be overwritten by checkout:
js/files_pdfviewer-node_modules_nextcloud_dialogs_dist_chunks_index-CWnkpNim_mjs.js.map.license
js/files_pdfviewer-vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-kaHdQqaz_mjs.js.map.license
Please commit your changes or stash them before you switch branches.
Aborting

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

ostasevych · 2024-08-23T15:47:25Z

Hey, so I cannot understand the solution. How to translate the strings, update them?

Is transifex supported?

I have modified template file where the strings are localised, plus the Ukrainian version. I can help to migrate main languages to the standard template file, if needed.

After each update I manually correct the template file, add the localiser strings. It is a bit annoying thing. So if no automatised solution found I am thinking just to fork the app.

susnux · 2024-08-24T10:32:39Z

@ostasevych We decided to use the PDFjs translations, but we fixed the language detection, see the closed issue.
Also to improve here @danxuliu is about to upgrade to PDFjs v4 which provides much better translation, even for languages not supported by Nextcloud.

susnux · 2024-08-24T10:33:08Z

Ref: #1022

ostasevych · 2024-08-24T10:38:32Z

@ostasevych We decided to use the PDFjs translations, but we fixed the language detection, see the closed issue.
Also to improve here @danxuliu is about to upgrade to PDFjs v4 which provides much better translation, even for languages not supported by Nextcloud.

Why? Why not to go in line with nc standards as other apps do?

Which framework to use in order to improve the translations? How to get know if new strings appear, eg transifex informs on that?

susnux · 2024-08-24T10:55:29Z

Why? Why not to go in line with nc standards as other apps do?

This app basically wraps the PDFjs library, a lot of strings are set internally.
So not everything could be translated as not every string is inside the template but is loaded from the JS.

Which framework to use in order to improve the translations? How to get know if new strings appear, eg transifex informs on that?

PDFjs is a mozilla library and uses the Mozilla L10n project for translations, I think all Mozilla products are translated at protoon: https://pontoon.mozilla.org/teams/

susnux · 2024-08-24T10:57:01Z

BTW if you are looking for Ukrainian: It is nearly 100% translated

ostasevych · 2024-08-24T11:56:09Z

BTW if you are looking for Ukrainian: It is nearly 100% translated !

I am a volunteer translator in Ukrainian, that is why I am so dissatisfied with the way how this app is built in terms of localisation :(
I feel that I have to continue locally my own way of localising the app with the NC traditional way: just replacing the code manually, adding uk.js and uk.json files to the l10n folder from version to version...

ostasevych · 2024-08-24T11:59:46Z

Don't know where to find those translations for PDFjs

Meh, even troubles with logging in there ...

susnux · 2024-08-24T15:15:51Z

Don't know where to find those translations for PDFjs

PDFjs is part of Firefox so the translations are also part of the firefox translation project.

I feel that I have to continue locally my own way of localising the app with the NC traditional way: just replacing the code manually, adding uk.js and uk.json files to the l10n folder from version to version...

But this does not fully work, as the strings are not all in the template, but also within the Javascript code of the library.

susnux · 2024-08-24T15:16:30Z

BTW do you experience any translation issues? (Since the merged fix, so with current master branch)

ostasevych · 2024-08-24T20:42:20Z

BTW do you experience any translation issues? (Since the merged fix, so with current master branch)

Nothing changed with 28.0.9. Instead of Ukrainian I see all strings in English. It is not working completely so I have to change the template and add my translations to my cloud.

viewer.zip
uk_js.zip

Ahhh! What did you do? Now my localisation is not working anymore. First time it shows in Ukrainian and in a second switches to English. :/

susnux · 2024-08-25T22:02:21Z

Nothing changed with 28.0.9.

No it is just in current master branch.

If I set Nextcloud language to Ukrainian and open a PDF file it is now working out of the box:

ostasevych · 2024-08-25T22:32:59Z

Nothing changed with 28.0.9.

No it is just in current master branch.

If I set Nextcloud language to Ukrainian and open a PDF file it is now working out of the box:

Ah, sorry. So, should I manually download and install the app from master branch?

ostasevych · 2024-08-25T22:49:58Z

I am getting error when running npm ci && npm run dev:

Building files_pdfviewer 4.0.0 

[webpack-cli] Failed to load '/www/html/nextcloud/apps/files_pdfviewer/webpack.config.js' config
[webpack-cli] /www/html/nextcloud/apps/files_pdfviewer/build-js/WebpackSPDXPlugin.js:46
	async #findPackage(dir) {
	                  ^

SyntaxError: Unexpected token '('
    at wrapSafe (internal/modules/cjs/loader.js:915:16)
    at Module._compile (internal/modules/cjs/loader.js:963:27)
    at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)
    at Module.load (internal/modules/cjs/loader.js:863:32)
    at Function.Module._load (internal/modules/cjs/loader.js:708:14)
    at Module.require (internal/modules/cjs/loader.js:887:19)
    at require (internal/modules/cjs/helpers.js:85:18)
    at Object.<anonymous> (/www/html/nextcloud/apps/files_pdfviewer/webpack.config.js:9:27)
    at Module._compile (internal/modules/cjs/loader.js:999:30)
    at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)

So, cannot replace the one app, which is provided with 28.0.9, which doesn't show Ukrainian strings (.

ostasevych · 2024-08-25T23:00:25Z

So, I have manually replaced js subfolder from git cloned archive in the app installed from the AppStore with the one, which is in the main branch, checked and it works.
What I would like to ask you to fix is viewer.css file, as it shows big Cyrillic symbols, so I changed the font size (see my viewer.css attached upper in the thread).

susnux · 2024-08-25T23:51:39Z

should I manually download and install the app from master branch?

Just until it is also fixed for 28 and 29 :)

ostasevych · 2024-09-30T19:38:10Z

Again, no localisation in 28.0.10. The language is still English.

susnux · 2024-09-30T21:11:12Z

Again, no localisation in 28.0.10. The language is still English.

Yes it is only backported to stable30 and stable29. So you would have to update to at least 29.

ostasevych · 2024-10-01T08:12:52Z

Again, no localisation in 28.0.10. The language is still English.

Yes it is only backported to stable30 and stable29. So you would have to update to at least 29.

What is wrong with backporting to 28.x?..

susnux requested review from skjnldsv and danxuliu and removed request for skjnldsv August 22, 2024 16:56

susnux added bug 3. to review labels Aug 22, 2024

susnux added this to the Nextcloud 31 milestone Aug 22, 2024

susnux mentioned this pull request Aug 22, 2024

fix: not showing localised strings using Chrome #1021

Closed

nextcloud-command force-pushed the fix/use-user-language branch from 1869688 to e37bce4 Compare August 22, 2024 17:08

backportbot bot added the backport-request label Aug 22, 2024

skjnldsv approved these changes Aug 22, 2024

View reviewed changes

susnux added 2 commits August 23, 2024 14:38

chore: Compile assets

6c641b2

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>

susnux force-pushed the fix/use-user-language branch from e37bce4 to 6c641b2 Compare August 23, 2024 12:52

susnux merged commit 1b1af33 into master Aug 23, 2024
37 checks passed

susnux deleted the fix/use-user-language branch August 23, 2024 13:02

This was referenced Aug 23, 2024

[stable30] fix: Use the user configured UI language for PDFjs instead of browser language #1026

Merged

[stable29] fix: Use the user configured UI language for PDFjs instead of browser language #1026 #1027

Merged

skjnldsv mentioned this pull request Jan 7, 2025

31.0.0 beta 1 nextcloud/server#50066

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Use the user configured UI language for PDFjs instead of browser language #1022

fix: Use the user configured UI language for PDFjs instead of browser language #1022

susnux commented Aug 22, 2024 •

edited

Loading

susnux commented Aug 22, 2024

susnux commented Aug 22, 2024

susnux commented Aug 22, 2024

susnux commented Aug 22, 2024

backportbot bot commented Aug 23, 2024

backportbot bot commented Aug 23, 2024

backportbot bot commented Aug 23, 2024

ostasevych commented Aug 23, 2024

susnux commented Aug 24, 2024

susnux commented Aug 24, 2024

ostasevych commented Aug 24, 2024

susnux commented Aug 24, 2024

susnux commented Aug 24, 2024

ostasevych commented Aug 24, 2024 •

edited

Loading

ostasevych commented Aug 24, 2024 •

edited

Loading

susnux commented Aug 24, 2024

susnux commented Aug 24, 2024

ostasevych commented Aug 24, 2024 •

edited

Loading

susnux commented Aug 25, 2024

ostasevych commented Aug 25, 2024

ostasevych commented Aug 25, 2024 •

edited

Loading

ostasevych commented Aug 25, 2024 •

edited

Loading

susnux commented Aug 25, 2024

ostasevych commented Sep 30, 2024

susnux commented Sep 30, 2024

ostasevych commented Oct 1, 2024

fix: Use the user configured UI language for PDFjs instead of browser language #1022

fix: Use the user configured UI language for PDFjs instead of browser language #1022

Conversation

susnux commented Aug 22, 2024 • edited Loading

Screen recording

Before

After

susnux commented Aug 22, 2024

susnux commented Aug 22, 2024

susnux commented Aug 22, 2024

susnux commented Aug 22, 2024

backportbot bot commented Aug 23, 2024

backportbot bot commented Aug 23, 2024

backportbot bot commented Aug 23, 2024

ostasevych commented Aug 23, 2024

susnux commented Aug 24, 2024

susnux commented Aug 24, 2024

ostasevych commented Aug 24, 2024

susnux commented Aug 24, 2024

susnux commented Aug 24, 2024

ostasevych commented Aug 24, 2024 • edited Loading

ostasevych commented Aug 24, 2024 • edited Loading

susnux commented Aug 24, 2024

susnux commented Aug 24, 2024

ostasevych commented Aug 24, 2024 • edited Loading

susnux commented Aug 25, 2024

ostasevych commented Aug 25, 2024

ostasevych commented Aug 25, 2024 • edited Loading

ostasevych commented Aug 25, 2024 • edited Loading

susnux commented Aug 25, 2024

ostasevych commented Sep 30, 2024

susnux commented Sep 30, 2024

ostasevych commented Oct 1, 2024

susnux commented Aug 22, 2024 •

edited

Loading

ostasevych commented Aug 24, 2024 •

edited

Loading

ostasevych commented Aug 24, 2024 •

edited

Loading

ostasevych commented Aug 24, 2024 •

edited

Loading

ostasevych commented Aug 25, 2024 •

edited

Loading

ostasevych commented Aug 25, 2024 •

edited

Loading