FvwmPager: Allow translation of "Desk %d" label via Gettext #1216

ONykyf · 2025-06-19T14:15:14Z

"Desk %d" label at the top of FvwmPager comes always in English, and can be easily localized in *.po (and then *.mo) translation file.

somiaj · 2025-06-19T14:30:06Z

modules/FvwmPager/init_pager.c

+	/* Initialize translations. */
+	FGettextInit("fvwm3", LOCALEDIR, "FvwmPager");
+


Please don't do this, we do not need to create a .pot file for FvwmPager that contains one string, instead add this to the .pot file for fvwm3. I have moved all the translations into a single file since they are overall quite small in fvwm.

FGettextInit("fvwm3", LOCALEDIR, "fvwm3");

Nobody is going to create a separate *.pot file. The name of this file is determined with the first argument domain, which is "fvwm3" everywhere. The third argument module is just used in log messages, hence all translated messages are collected to fvwm3.pot. All my translations to FvwmForm and FvwmPager are in fvwm3.po, and everything works OK, You can verify it yourself.

I have noticed that module is also set to "fvwm3" in the existing code, but there is no point for this, we lose additional debug info. I would rather add different module parameters for different Fvwm modules.

Ahh, yea, I guess the second string is never actually used in any meaningful way. When I updated all the translation stuff I did away with separate translations per modules as it was way harder to maintain, and I just changed all the calls to what I suggested. Please just update it to be consistent with how I have it setup for other modules to use this wrapper. Though the actual string you send for the module name has no actual effect.

Then You might consider just removing the third parameter everywhere, because in this case it is meaningless anyway.

I agree, but at the time that I combined all the pot files, I just went with what is there. Problem with such an old project is there are lots of things like this, but they are working, so it really isn't that important.

I have searched the code through, and FGModuleName variable, which is set by module parameter, is used only once, so no real profit, and it can be safely ignored (or removed, which is even better), so let it be "fvwm3".

Then You might consider just removing the third parameter everywhere, because in this case it is meaningless anyway.

Nah, it can stay. I don't want to change it just for code-churn.

somiaj · 2025-06-19T14:32:22Z

You should also be more complete on your pull requests, FvwmPager now outputs the 'Monitor RANDRNAME' string if configured, that should also be translated. I can't think of any other strings that might need translated off the top of my head, but you should add those too. Also this pr will need to follow the instructions to update the main fvwm3.pot file with any new strings.

ONykyf · 2025-06-19T15:48:21Z

You should also be more complete on your pull requests, FvwmPager now outputs the 'Monitor RANDRNAME' string if configured, that should also be translated.

Could You point me to the place in the code where this string is output? I looked through the FvwmPager code and have found no more strings to translate. As far as I remember, "Monitor " is not output before the name, I checked it specifically (but I might be wrong).

I can't think of any other strings that might need translated off the top of my head, but you should add those too. Also this pr will need to follow the instructions to update the main fvwm3.pot file with any new strings.

It is updated because ../modules/FvwmPager/FvwmPager.c is added to POTFILES and fvwmpo.sh. It also works well in my setup and build script.

somiaj · 2025-06-19T16:06:54Z

Could You point me to the place in the code where this string is output? I looked through the FvwmPager code and have found no more strings to translate. As far as I remember, "Monitor " is not output before the name, I checked it specifically (but I might be wrong).

The function which is drawing the labels is draw_desk_label in x_pager.c. I guess I was incorrect, the names are just RandR names, so there is nothing to be translated. But You may want to consider that there are also a small alternative to the labels that appear with small pagers, for desks, the label will just be Dn instead of Desk n (or whatever is set). You may want to translate that too?

somiaj · 2025-06-19T16:08:50Z

It is updated because ../modules/FvwmPager/FvwmPager.c is added to POTFILES and fvwmpo.sh. It also works well in my setup and build script.

I saw, I was just saying run ./fvwmpo.shas part of this PR, so any new translation strings you have added are included in the .pot, vs waiting for some translator (which are very rare in fvwm) to come along and do that.

ONykyf · 2025-06-19T16:10:03Z

But You may want to consider that there are also a small alternative to the labels that appear with small pagers, for desks, the label will just be Dn instead of Desk n (or whatever is set). You may want to translate that too?

It's a nice idea, I will look at this now.

ONykyf · 2025-06-19T16:12:37Z

It is updated because ../modules/FvwmPager/FvwmPager.c is added to POTFILES and fvwmpo.sh. It also works well in my setup and build script.

I saw, I was just saying run ./fvwmpo.shas part of this PR, so any new translation strings you have added are included in the .pot, vs waiting for some translator (which are very rare in fvwm) to come along and do that.

Ok, I will do it now.

ThomasAdam · 2025-06-20T12:13:17Z

modules/FvwmPager/init_pager.c

-	initialize_desks_and_monitors();
 	initialize_fonts();
+	initialize_desks_and_monitors();


Because initialize_fonts() contains localization and (since now) translation, and initialize_desks_and_monitors() uses it to set desk label. I have checked that there is no other interference between these two functions.

ThomasAdam · 2025-06-21T13:03:46Z

modules/FvwmPager/x_pager.c

@@ -31,6 +31,7 @@
 #include <stdbool.h>

 #include "libs/FShape.h"
+#include "libs/FGettext.h"


It's not strictly "missing" per-se, in that it comes via libfvwm3.a, but it's fine to explicitly include it here.

ThomasAdam · 2025-06-21T13:05:28Z

OK.

FvwmPager: Allow translation of "Desk %d" label via Gettext

cc57fcb

"Desk %d" label at the top of FvwmPager comes always in English, and can be easily localized in *.po (and then *.mo) translation file.

somiaj reviewed Jun 19, 2025

View reviewed changes

ONykyf and others added 3 commits June 19, 2025 20:21

FvwmPager: Translate short label as well and update POT file

c3e02bc

FVwmPager: Unify the use of a fake parameter

6e945a7

FvwmPager: Add missed header

ec4f808

ThomasAdam reviewed Jun 20, 2025

View reviewed changes

ThomasAdam reviewed Jun 21, 2025

View reviewed changes

ThomasAdam added area:doc Relates to documentation only relates:module Issue is in module code labels Jun 21, 2025

ThomasAdam added this to FVWM3 Jun 21, 2025

github-project-automation bot moved this to PRs in FVWM3 Jun 21, 2025

ThomasAdam added this to the 1.1.4 milestone Jun 21, 2025

ThomasAdam merged commit 6000175 into fvwmorg:main Jun 21, 2025
8 checks passed

github-project-automation bot moved this from PRs to Done in FVWM3 Jun 21, 2025

		/* Initialize translations. */
		FGettextInit("fvwm3", LOCALEDIR, "FvwmPager");

Uh oh!

FvwmPager: Allow translation of "Desk %d" label via Gettext #1216

FvwmPager: Allow translation of "Desk %d" label via Gettext #1216

Uh oh!

Conversation

ONykyf commented Jun 19, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ONykyf Jun 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

somiaj commented Jun 19, 2025

Uh oh!

ONykyf commented Jun 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

somiaj commented Jun 19, 2025

Uh oh!

somiaj commented Jun 19, 2025

Uh oh!

ONykyf commented Jun 19, 2025

Uh oh!

ONykyf commented Jun 19, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ONykyf Jun 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ThomasAdam commented Jun 21, 2025

Uh oh!

Uh oh!

Uh oh!

ONykyf Jun 19, 2025 •

edited

Loading

ONykyf commented Jun 19, 2025 •

edited

Loading

ONykyf Jun 20, 2025 •

edited

Loading