See diff. You can view, comment on, or merge this pull request online at:
https://github.com/geany/geany-plugins/pull/769
-- Commit Summary --
* FIX: Spaces after dots in translatable strings
-- File Changes --
M geanyvc/src/geanyvc.c (2) M workbench/src/dialogs.c (2)
-- Patch Links --
https://github.com/geany/geany-plugins/pull/769.patch https://github.com/geany/geany-plugins/pull/769.diff
Wouldn't it be better to move the spaces into line before?
b4n requested changes on this pull request.
As mentioned, this would lead to not having any space between the dot and the next word, which is inappropriate.
@@ -1949,7 +1949,7 @@ plugin_configure(GtkDialog * dialog)
gtk_widget_set_tooltip_text(widgets.cb_editor_menu_entries, _("Whether menu for this plugin are getting placed either " "inside tools menu or directly inside Geany's menubar." - "Will take in account after next start of GeanyVC")); + " Will take in account after next start of GeanyVC"));
This is not appropriate: there should be a space between the dot and the next word, and the C string syntax `"xxx" "yyy"` is equivalent to `"xxxyyy"`, not `"xxx yyy"`. If you really want to move the space, place it after the dot on the previous line.
@@ -444,7 +444,7 @@ gboolean dialogs_workbench_settings(WORKBENCH *workbench)
gtk_widget_set_tooltip_text(w_enable_live_update, _("If the option is activated (default), then the list of files and the sidebar" " will be updated automatically if a file or directory is created, removed or renamed." - "A manual re-scan is not required if the option is enabled.")); + " A manual re-scan is not required if the option is enabled."));
same here.
@Skif-off pushed 1 commit.
6074149 FIX: Fix :)
b4n approved this pull request.
Oops, my bad, I didn't see you were *adding* the missing space, sorry -- I must still be half-asleep somehow. Anyway, I like it better like that :+1:
@@ -443,7 +443,7 @@ gboolean dialogs_workbench_settings(WORKBENCH *workbench)
ui_table_add_row(GTK_TABLE(table), 1, w_enable_live_update, NULL); gtk_widget_set_tooltip_text(w_enable_live_update, _("If the option is activated (default), then the list of files and the sidebar" - " will be updated automatically if a file or directory is created, removed or renamed." + " will be updated automatically if a file or directory is created, removed or renamed. "
Ideally the leading space here would also be on the previous line, but that's OK with this.
b4n commented on this pull request.
@@ -1949,7 +1949,7 @@ plugin_configure(GtkDialog * dialog)
gtk_widget_set_tooltip_text(widgets.cb_editor_menu_entries, _("Whether menu for this plugin are getting placed either " "inside tools menu or directly inside Geany's menubar." - "Will take in account after next start of GeanyVC")); + " Will take in account after next start of GeanyVC"));
Forget my comment, it was absurd, I read the diff the wrong way around.
Done (fix + squash).
Sorry, I saw strings with space in beginning below/above and maked it so ([1](https://github.com/geany/geany-plugins/blob/master/workbench/src/dialogs.c#L...), [2](https://github.com/geany/geany-plugins/blob/master/workbench/src/dialogs.c#L...), [3](https://github.com/geany/geany-plugins/blob/master/workbench/src/dialogs.c#L...)).
Skif-off commented on this pull request.
@@ -443,7 +443,7 @@ gboolean dialogs_workbench_settings(WORKBENCH *workbench)
ui_table_add_row(GTK_TABLE(table), 1, w_enable_live_update, NULL); gtk_widget_set_tooltip_text(w_enable_live_update, _("If the option is activated (default), then the list of files and the sidebar" - " will be updated automatically if a file or directory is created, removed or renamed." + " will be updated automatically if a file or directory is created, removed or renamed. "
Will do it?
Merged #769 into master.
Skif-off commented on this pull request.
@@ -443,7 +443,7 @@ gboolean dialogs_workbench_settings(WORKBENCH *workbench)
ui_table_add_row(GTK_TABLE(table), 1, w_enable_live_update, NULL); gtk_widget_set_tooltip_text(w_enable_live_update, _("If the option is activated (default), then the list of files and the sidebar" - " will be updated automatically if a file or directory is created, removed or renamed." + " will be updated automatically if a file or directory is created, removed or renamed. "
Ops, merged.
frlan commented on this pull request.
@@ -443,7 +443,7 @@ gboolean dialogs_workbench_settings(WORKBENCH *workbench)
ui_table_add_row(GTK_TABLE(table), 1, w_enable_live_update, NULL); gtk_widget_set_tooltip_text(w_enable_live_update, _("If the option is activated (default), then the list of files and the sidebar" - " will be updated automatically if a file or directory is created, removed or renamed." + " will be updated automatically if a file or directory is created, removed or renamed. "
Did see the leading space to late. Will change it directly
b4n commented on this pull request.
@@ -443,7 +443,7 @@ gboolean dialogs_workbench_settings(WORKBENCH *workbench)
ui_table_add_row(GTK_TABLE(table), 1, w_enable_live_update, NULL); gtk_widget_set_tooltip_text(w_enable_live_update, _("If the option is activated (default), then the list of files and the sidebar" - " will be updated automatically if a file or directory is created, removed or renamed." + " will be updated automatically if a file or directory is created, removed or renamed. "
It's not a problem as there are many strings like that in the workbench plugin
I also updated the strings in the translations to include the space, as it doesn't have to be reviewed by translators (I made sure that the translations didn't have the same dot issue, and they don't): 65475dac74800f8e07d0102beeb64ed1a2612212
I added a small section "Translation" to geany's HACKING file to prevent others from making the same fault as me.
github-comments@lists.geany.org