GNOME Bugzilla – Bug 610048
Various string fixes
Last modified: 2010-12-21 18:09:10 UTC
Created attachment 153872 [details] [review] Miscellaneous string fixes Patches coming up to fix various string problems in gedit. They apply in order, though don't really overlap, so might work if applied out of order.
Created attachment 153873 [details] [review] Fix use of "auto-" prefix in strings
Created attachment 153874 [details] [review] Standardise use of "character encoding" vs "character coding" I'm not sure whether the use of "character coding" is technically correct, and I just haven't heard of the term before. However, to the best of my knowledge, it should be "character encoding".
Created attachment 153875 [details] [review] Use Unicode ellipses
Created attachment 153877 [details] [review] Internationalisation improvements
Review of attachment 153877 [details] [review]: This one looks fine by me
Review of attachment 153875 [details] [review]: About this AFAIK we didn't want to add unicode chars in the code.
(In reply to comment #7) > Review of attachment 153875 [details] [review]: > > About this AFAIK we didn't want to add unicode chars in the code. Why not? Modern compilers are happy with them (and to make them more happy, I could convert the Unicode characters to octal escapes). All strings in GTK+ programs are defined to be UTF-8 anyway, so there's no problem there. The ellipsis character is present in almost all standard Linux fonts. The bug for converting GTK+ is bug #595615.
Review of attachment 153873 [details] [review]: Some comments on the use of 'autodetecting' (feel free to shoot me down, I'm not a native speaker) ::: data/gedit.schemas.in.in @@ +439,3 @@ <default><!-- Translators: This is the sorted list of encodings used by gedit <locale name="C"> + for autodetecting the encoding of a file. You may want to customize it adding Wouldn't 'automatic detection of the file encoding' be better here? @@ +450,3 @@ See http://svn.gnome.org/viewcvs/gedit/trunk/gedit/gedit-encodings.c?view=markup for + <long>Sorted list of encodings used by gedit for autodetecting the encoding of + <short>Autodetected Encodings</short> Same as above, avoiding the word 'autodetecting' ::: gedit/gedit-encodings-combo-box.c @@ +270,3 @@ gtk_list_store_set (store, &iter, gtk_list_store_append (store, &iter); + NAME_COLUMN, _("Autodetected"), I don't really like the word autodetected, wouldn't 'Automatically Detected' be better (does that fit?)
Review of attachment 153874 [details] [review]: This can go in I think.
(In reply to comment #9) > Review of attachment 153873 [details] [review]: > > Some comments on the use of 'autodetecting' (feel free to shoot me down, I'm > not a native speaker) *snip* I completely agree. Shall I commit the patch with those changes?
Committed patches #3 and #5 to master, and sent a notification e-mail to gnome-doc-list and gnome-i18n. commit 9c64d2d66430773ad679233441f1c75cdf9c5e7f Author: Philip Withnall <philip@tecnocode.co.uk> Date: Wed Feb 17 15:57:40 2010 +0000 Internationalisation improvements Removed some markup in strings, added some translator comments and removed the "translatable" tag from some strings which were inappropriately marked a such. Helps: bgo#610048 gedit/gedit-print-preferences.ui | 4 +- gedit/gedit-print-preview.c | 1 + plugins/docinfo/docinfo.ui | 25 +++++++++++++---------- plugins/filebrowser/gedit-file-browser-store.c | 2 + plugins/snippets/snippets/snippets.ui | 5 +++- plugins/spell/gedit-automatic-spell-checker.c | 1 + plugins/spell/gedit-spell-checker-dialog.c | 3 ++ plugins/spell/spell-checker.ui | 10 +++++++- plugins/time/gedit-time-setup-dialog.ui | 5 +++- 9 files changed, 39 insertions(+), 17 deletions(-) commit 038b466573ff664439f587ea7396aac9d20743c2 Author: Philip Withnall <philip@tecnocode.co.uk> Date: Wed Feb 17 15:56:44 2010 +0000 Standardise use of "character encoding" vs "character coding" Ensure strings consistently refer to "character encoding" rather than "character coding". Helps: bgo#610048 data/gedit.schemas.in.in | 26 +++++++++++++------------- gedit/dialogs/gedit-encodings-dialog.c | 2 +- gedit/dialogs/gedit-encodings-dialog.ui | 2 +- gedit/gedit-file-chooser-dialog.c | 2 +- gedit/gedit-io-error-message-area.c | 16 ++++++++-------- 5 files changed, 24 insertions(+), 24 deletions(-)
(In reply to comment #11) > (In reply to comment #9) > > Review of attachment 153873 [details] [review] [details]: > > > > Some comments on the use of 'autodetecting' (feel free to shoot me down, I'm > > not a native speaker) > *snip* > > I completely agree. Shall I commit the patch with those changes? feel free.
Patch #2 committed to master, and gnome-doc-list and gnome-i18n notified. If it's not possible to resolve the debate over Unicode characters soon, I'd rather commit patch #1 without the Unicode changes (and discuss them later) than miss string freeze. commit dea4b02f4fb338dc63bd6a5c92afe841787f7c11 Author: Philip Withnall <philip@tecnocode.co.uk> Date: Thu Feb 18 12:47:50 2010 +0000 Fix use of "auto-" prefix in strings Fix the use of the "auto-" prefix in strings to eliminate use of the ugly "auto-" prefix as much as possible, and make strings conform to the terminology list in the GNOME style guide otherwise. Helps: bgo#610048 data/gedit.schemas.in.in | 20 ++++++++++---------- gedit/gedit-encodings-combo-box.c | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-)
Review of attachment 153872 [details] [review]: Just one minor comment. Apart from that it looks good to me. ::: data/gedit.schemas.in.in @@ +200,3 @@ <short>Highlight Matching Bracket</short> <locale name="C"> + <long>Whether gedit should highlight matching brackets.</long> I think here should be bracket, as what we highlight is just one bracket.
(In reply to comment #15) > Review of attachment 153872 [details] [review]: > > Just one minor comment. Apart from that it looks good to me. Should I commit the Unicode stuff then? > ::: data/gedit.schemas.in.in > @@ +200,3 @@ > <short>Highlight Matching Bracket</short> > <locale name="C"> > + <long>Whether gedit should highlight matching brackets.</long> > > I think here should be bracket, as what we highlight is just one bracket. That won't work; it sounds wrong. How about: "Whether gedit should highlight the bracket matching the selected one."? That's a little longer though.
(In reply to comment #16) > (In reply to comment #15) > > Review of attachment 153872 [details] [review] [details]: > > > > Just one minor comment. Apart from that it looks good to me. > > Should I commit the Unicode stuff then? Not for now, we already have to discuss about this, and I'd like to see the gtk+ patch committed first. > > > ::: data/gedit.schemas.in.in > > @@ +200,3 @@ > > <short>Highlight Matching Bracket</short> > > <locale name="C"> > > + <long>Whether gedit should highlight matching brackets.</long> > > > > I think here should be bracket, as what we highlight is just one bracket. > > That won't work; it sounds wrong. How about: "Whether gedit should highlight > the bracket matching the selected one."? That's a little longer though. Well, it is the long description so it shouldn't be a problem.
Patch #1 committed to master, without the Unicode changes. I'll upload an updated patch with those in a minute. commit 547ee7c994480b448dbb6f355f099f61c5990fd0 Author: Philip Withnall <philip@tecnocode.co.uk> Date: Sat Feb 20 10:40:04 2010 +0000 Miscellaneous string fixes Various small string fixes, including capitalisation and consistency fixes. Helps: bgo#610048 data/gedit.schemas.in.in | 8 +++--- gedit/dialogs/gedit-close-confirmation-dialog.c | 2 +- gedit/dialogs/gedit-preferences-dialog.c | 2 +- gedit/gedit-documents-panel.c | 4 +- gedit/gedit-help.c | 2 +- gedit/gedit-io-error-message-area.c | 10 ++++---- gedit/gedit-prefs-manager.c | 4 +- gedit/gedit-ui.h | 4 +- gedit/gedit-utils.c | 2 +- gedit/gedit-window.c | 4 +- gedit/gedit.c | 2 +- plugins/checkupdate/gedit-check-update-plugin.c | 4 +- plugins/docinfo/gedit-docinfo-plugin.c | 2 +- plugins/filebrowser/gedit-file-browser-widget.c | 2 +- plugins/filebrowser/gedit-file-browser.schemas.in | 4 +- .../pythonconsole.gedit-plugin.desktop.in | 2 +- plugins/snippets/snippets.gedit-plugin.desktop.in | 2 +- plugins/snippets/snippets/Exporter.py | 6 ++-- plugins/snippets/snippets/Importer.py | 14 +++++----- plugins/snippets/snippets/Manager.py | 4 +- plugins/snippets/snippets/Placeholder.py | 6 ++-- plugins/snippets/snippets/snippets.ui | 2 +- plugins/taglist/HTML.tags.xml.in | 24 ++++++++++---------- plugins/taglist/Latex.tags.xml.in | 6 ++-- plugins/taglist/taglist.gedit-plugin.desktop.in | 2 +- 25 files changed, 62 insertions(+), 62 deletions(-)
Created attachment 154261 [details] [review] Use proper em-dashes Updated version of patch #1 with just the em-dash changes.
I lost a bit track of all the changes proposed here, which one were already merged etc. Philip: can you sum up which patches are missing and what they do? As a general rule my position is: - I prefer to avoid utf8 chars in the interface for things like "..." and quotes. At least until a general decision is made gnome-wide - *If* we use utf8 chars, they should be put in the the C source files as escaped sequences, the C source files must stay plain ASCII files There may be exception to the rules above to be evaluated case by case, for instance the last patch that uses "em-dashes" in the tags xml files is ok with me (though it is kind of pedant ;). Not sure if it will cause pain to the translators though. As far as I am concerned it can go in early next cycle (not worth breaking string freeze now)
(In reply to comment #20) > I lost a bit track of all the changes proposed here, which one were already > merged etc. > > Philip: can you sum up which patches are missing and what they do? Patch #153875 to use Unicode ellipses hasn't been committed, since it's still under discussion. Patch #154261 to use Unicode em-dashes hasn't been committed either. > As a general rule my position is: > > - I prefer to avoid utf8 chars in the interface for things like "..." and > quotes. At least until a general decision is made gnome-wide > - *If* we use utf8 chars, they should be put in the the C source files as > escaped sequences, the C source files must stay plain ASCII files > > > There may be exception to the rules above to be evaluated case by case, for > instance the last patch that uses "em-dashes" in the tags xml files is ok with > me (though it is kind of pedant ;). Not sure if it will cause pain to the > translators though. As far as I am concerned it can go in early next cycle (not > worth breaking string freeze now) Right. I am a hopeless pedant. :-) I'll commit patch #154261 after gedit's out of string freeze then.
(In reply to comment #21) > I'll commit patch #154261 [details] after gedit's out of string freeze then. When're you planning on branching? I can't commit until master's out of string freeze.
I inform you that gedit is now branched.
Committed, thanks.
Philip, I close the bug then … :)
The discussion about patch #153875 has been resolved then?
afaik it is missing that patch as as pbor said: - *If* we use utf8 chars, they should be put in the the C source files as escaped sequences, the C source files must stay plain ASCII files
(In reply to comment #27) > - *If* we use utf8 chars, they should be put in the the C source files as > escaped sequences, the C source files must stay plain ASCII files I'll come up with an updated patch if the following question is answered: (In reply to comment #20) > - I prefer to avoid utf8 chars in the interface for things like "..." and > quotes. At least until a general decision is made gnome-wide As far as I know, there hasn't yet been a GNOME-wide decision about this, so do you want to continue to wait until there is, or make the changes now anyway?
As said in comment 20 I prefer plain ASCII for things that are common like quotes and ellipsis, since I do not see much gain in using the utf8 equivalents and it would just be inconsistent with all the other apps (unless GNOME decides to convert everything, which as you say has not been the case).
I'll mark this as FIXED then, and a new bug can be opened if and when a GNOME-wide decision is made about Unicode characters.