[PATCH] Re: Dialog titles not translated
On Fri, Apr 05, 2002 at 12:49:25PM +0200, [EMAIL PROTECTED] wrote: When you open a Browse dialog from some other dialogs, such as Insert-Graphics, File-Print, and Insert-ListsTOC-BibTeX. However it works from Edit-Preferences. I don't know if the attached is correct. john -- I never understood what's so hard about picking a unique first and last name - and not going beyond the 6 character limit. - Toon Moene Index: src/frontends/controllers/ChangeLog === RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ChangeLog,v retrieving revision 1.155 diff -u -r1.155 ChangeLog --- src/frontends/controllers/ChangeLog 8 Apr 2002 14:55:52 - 1.155 +++ src/frontends/controllers/ChangeLog 8 Apr 2002 15:24:21 - @@ -1,3 +1,9 @@ +2002-04-08 John Levon [EMAIL PROTECTED] + + * ControlGraphics.C: + * ControlPrint.C: + * ControlBibtex.C: make N_() be _() + 2002-04-07 Herbert Voss [EMAIL PROTECTED] * ControlGraphics.[C]: move readBB as readBB_from_PSFile into filetools Index: src/frontends/controllers/ControlBibtex.C === RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlBibtex.C,v retrieving revision 1.11 diff -u -r1.11 ControlBibtex.C --- src/frontends/controllers/ControlBibtex.C 22 Mar 2002 15:24:31 - 1.11 +++ src/frontends/controllers/ControlBibtex.C 8 Apr 2002 15:24:22 - @@ -65,7 +65,7 @@ string const title, string const pattern) { - pairstring, string dir1(N_(Documents|#o#O), string(lyxrc.document_path)); + pairstring, string dir1(_(Documents|#o#O), string(lyxrc.document_path)); return browseRelFile(lv_, in_name, lv_.buffer()-filePath(), title, pattern, dir1); } Index: src/frontends/controllers/ControlGraphics.C === RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlGraphics.C,v retrieving revision 1.30 diff -u -r1.30 ControlGraphics.C --- src/frontends/controllers/ControlGraphics.C 8 Apr 2002 14:55:52 - 1.30 +++ src/frontends/controllers/ControlGraphics.C 8 Apr 2002 15:24:22 - @@ -84,7 +84,7 @@ string const ControlGraphics::Browse(string const in_name) { - string const title = N_(Select graphics file); + string const title = _(Select graphics file); // FIXME: currently we need the second '|' to prevent mis-interpretation string const pattern = *.(ps|eps|png|jpeg|jpg|gif|gz)|; @@ -94,8 +94,8 @@ if (!(fileInfo.isOK() fileInfo.isDir())) // No - bail out to system clipart directory clipdir = AddName (system_lyxdir, clipart); - pairstring, string dir1(N_(Clipart|#C#c), clipdir); - pairstring, string dir2(N_(Documents|#o#O), string(lyxrc.document_path)); + pairstring, string dir1(_(Clipart|#C#c), clipdir); + pairstring, string dir2(_(Documents|#o#O), string(lyxrc.document_path)); // Show the file browser dialog return browseRelFile(lv_, in_name, lv_.buffer()-filePath(), title, pattern, dir1, dir2); Index: src/frontends/controllers/ControlPrint.C === RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlPrint.C,v retrieving revision 1.16 diff -u -r1.16 ControlPrint.C --- src/frontends/controllers/ControlPrint.C22 Mar 2002 15:24:31 - 1.16 +++ src/frontends/controllers/ControlPrint.C8 Apr 2002 15:24:22 - @@ -86,7 +86,7 @@ string const ControlPrint::Browse(string const in_name) { - string const title = N_(Print to file); + string const title = _(Print to file); string const pattern = *.ps; // Show the file browser dialog
Re: [PATCH] Re: Dialog titles not translated
On Monday 08 April 2002 4:25 pm, John Levon wrote: On Fri, Apr 05, 2002 at 12:49:25PM +0200, [EMAIL PROTECTED] wrote: When you open a Browse dialog from some other dialogs, such as Insert-Graphics, File-Print, and Insert-ListsTOC-BibTeX. However it works from Edit-Preferences. I don't know if the attached is correct. john Thanks, John. It is. Angus
[PATCH] Re: Dialog titles not translated
On Fri, Apr 05, 2002 at 12:49:25PM +0200, [EMAIL PROTECTED] wrote: > When you open a "Browse" dialog from some other dialogs, such as > Insert->Graphics, File->Print, and Insert->Lists>BibTeX. > However it works from Edit->Preferences. I don't know if the attached is correct. john -- "I never understood what's so hard about picking a unique first and last name - and not going beyond the 6 character limit." - Toon Moene Index: src/frontends/controllers/ChangeLog === RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ChangeLog,v retrieving revision 1.155 diff -u -r1.155 ChangeLog --- src/frontends/controllers/ChangeLog 8 Apr 2002 14:55:52 - 1.155 +++ src/frontends/controllers/ChangeLog 8 Apr 2002 15:24:21 - @@ -1,3 +1,9 @@ +2002-04-08 John Levon <[EMAIL PROTECTED]> + + * ControlGraphics.C: + * ControlPrint.C: + * ControlBibtex.C: make N_() be _() + 2002-04-07 Herbert Voss <[EMAIL PROTECTED]> * ControlGraphics.[C]: move readBB as readBB_from_PSFile into filetools Index: src/frontends/controllers/ControlBibtex.C === RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlBibtex.C,v retrieving revision 1.11 diff -u -r1.11 ControlBibtex.C --- src/frontends/controllers/ControlBibtex.C 22 Mar 2002 15:24:31 - 1.11 +++ src/frontends/controllers/ControlBibtex.C 8 Apr 2002 15:24:22 - @@ -65,7 +65,7 @@ string const & title, string const & pattern) { - pairdir1(N_("Documents|#o#O"), string(lyxrc.document_path)); + pair dir1(_("Documents|#o#O"), string(lyxrc.document_path)); return browseRelFile(_, in_name, lv_.buffer()->filePath(), title, pattern, dir1); } Index: src/frontends/controllers/ControlGraphics.C === RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlGraphics.C,v retrieving revision 1.30 diff -u -r1.30 ControlGraphics.C --- src/frontends/controllers/ControlGraphics.C 8 Apr 2002 14:55:52 - 1.30 +++ src/frontends/controllers/ControlGraphics.C 8 Apr 2002 15:24:22 - @@ -84,7 +84,7 @@ string const ControlGraphics::Browse(string const & in_name) { - string const title = N_("Select graphics file"); + string const title = _("Select graphics file"); // FIXME: currently we need the second '|' to prevent mis-interpretation string const pattern = "*.(ps|eps|png|jpeg|jpg|gif|gz)|"; @@ -94,8 +94,8 @@ if (!(fileInfo.isOK() && fileInfo.isDir())) // No - bail out to system clipart directory clipdir = AddName (system_lyxdir, "clipart"); - pair dir1(N_("Clipart|#C#c"), clipdir); - pair dir2(N_("Documents|#o#O"), string(lyxrc.document_path)); + pair dir1(_("Clipart|#C#c"), clipdir); + pair dir2(_("Documents|#o#O"), string(lyxrc.document_path)); // Show the file browser dialog return browseRelFile(_, in_name, lv_.buffer()->filePath(), title, pattern, dir1, dir2); Index: src/frontends/controllers/ControlPrint.C === RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlPrint.C,v retrieving revision 1.16 diff -u -r1.16 ControlPrint.C --- src/frontends/controllers/ControlPrint.C22 Mar 2002 15:24:31 - 1.16 +++ src/frontends/controllers/ControlPrint.C8 Apr 2002 15:24:22 - @@ -86,7 +86,7 @@ string const ControlPrint::Browse(string const & in_name) { - string const title = N_("Print to file"); + string const title = _("Print to file"); string const pattern = "*.ps"; // Show the file browser dialog
Re: [PATCH] Re: Dialog titles not translated
On Monday 08 April 2002 4:25 pm, John Levon wrote: > On Fri, Apr 05, 2002 at 12:49:25PM +0200, [EMAIL PROTECTED] wrote: > > When you open a "Browse" dialog from some other dialogs, such as > > Insert->Graphics, File->Print, and Insert->Lists>BibTeX. > > However it works from Edit->Preferences. > > I don't know if the attached is correct. > > john Thanks, John. It is. Angus
Re: Dialog titles not translated
On Fri, Apr 05, 2002 at 12:49:25PM +0200, [EMAIL PROTECTED] wrote: When you open a Browse dialog from some other dialogs, such as Insert-Graphics, File-Print, and Insert-ListsTOC-BibTeX. These use N_() not _() ... john -- I never understood what's so hard about picking a unique first and last name - and not going beyond the 6 character limit. - Toon Moene
Re: Dialog titles not translated
On Friday 05 April 2002 3:14 pm, John Levon wrote: On Fri, Apr 05, 2002 at 12:49:25PM +0200, [EMAIL PROTECTED] wrote: When you open a Browse dialog from some other dialogs, such as Insert-Graphics, File-Print, and Insert-ListsTOC-BibTeX. These use N_() not _() ... john But they shouldn't...
Re: Dialog titles not translated
Angus == Angus Leeming [EMAIL PROTECTED] writes: Angus On Friday 05 April 2002 3:14 pm, John Levon wrote: On Fri, Apr 05, 2002 at 12:49:25PM +0200, [EMAIL PROTECTED] wrote: When you open a Browse dialog from some other dialogs, such as Insert-Graphics, File-Print, and Insert-ListsTOC-BibTeX. These use N_() not _() ... Angus But they shouldn't... Indeed...
Re: Dialog titles not translated
On Fri, Apr 05, 2002 at 12:49:25PM +0200, [EMAIL PROTECTED] wrote: > When you open a "Browse" dialog from some other dialogs, such as > Insert->Graphics, File->Print, and Insert->Lists>BibTeX. These use N_() not _() ... john -- "I never understood what's so hard about picking a unique first and last name - and not going beyond the 6 character limit." - Toon Moene
Re: Dialog titles not translated
On Friday 05 April 2002 3:14 pm, John Levon wrote: > On Fri, Apr 05, 2002 at 12:49:25PM +0200, [EMAIL PROTECTED] wrote: > > When you open a "Browse" dialog from some other dialogs, such as > > Insert->Graphics, File->Print, and Insert->Lists>BibTeX. > > These use N_() not _() ... > > john But they shouldn't...
Re: Dialog titles not translated
> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes: Angus> On Friday 05 April 2002 3:14 pm, John Levon wrote: >> On Fri, Apr 05, 2002 at 12:49:25PM +0200, [EMAIL PROTECTED] >> wrote: > When you open a "Browse" dialog from some other dialogs, >> such as > Insert->Graphics, File->Print, and >> Insert->Lists>BibTeX. >> >> These use N_() not _() ... Angus> But they shouldn't... Indeed...