r455 - in trunk: . scripts

[DONOTREPLY at icculus.org]

Author: icculus
Date: 2008-01-23 17:32:11 -0500 (Wed, 23 Jan 2008)
New Revision: 455

Modified:
   trunk/gui_stdio.c
   trunk/scripts/localization.lua
Log:
Removed some newlines from stdio UI prompts.


Modified: trunk/gui_stdio.c
===================================================================
--- trunk/gui_stdio.c	2008-01-23 22:17:30 UTC (rev 454)
+++ trunk/gui_stdio.c	2008-01-23 22:32:11 UTC (rev 455)
@@ -130,8 +130,8 @@
     if (!feof(stdin))
     {
         const char *_fmt = ((defval) ?
-                                entry->_("%0\n[Y/n]: ") :
-                                entry->_("%0\n[y/N]: "));
+                                entry->_("%0 [Y/n]: ") :
+                                entry->_("%0 [y/N]: "));
 
         char *fmt = entry->xstrdup(_fmt);
         char *msg = entry->format(fmt, text);
@@ -145,7 +145,7 @@
             int rc = 0;
 
             getout = true;  // we may reset this later.
-            printf("%s\n", msg);
+            printf("%s", msg);
             fflush(stdout);
             rc = read_stdin(buf, sizeof (buf));
 

Modified: trunk/scripts/localization.lua
===================================================================
--- trunk/scripts/localization.lua	2008-01-23 22:17:30 UTC (rev 454)
+++ trunk/scripts/localization.lua	2008-01-23 22:32:11 UTC (rev 455)
@@ -111,26 +111,26 @@
 
     -- stdio UI plugin says this for yes/no prompts that default to yes.
     -- "%0" is the question the user is being asked to respond to.
-    ["%0\n[Y/n]: "] = {
-        de = "%0\n[J/n]",
-        nb = "%0\n[J/n]: ",
-        se = "%0\n[J/n]: ",
+    ["%0 [Y/n]: "] = {
+        de = "%0 [J/n]",
+        nb = "%0 [J/n]: ",
+        se = "%0 [J/n]: ",
     };
 
     -- stdio UI plugin says this for yes/no prompts that default to no.
     -- "%0" is the question the user is being asked to respond to.
-    ["%0\n[y/N]: "] = {
-        de = "%0\n[j/N]",
-        nb = "%0\n[j/N]: ",
-        se = "%0\n[j/N]: ",
+    ["%0 [y/N]: "] = {
+        de = "%0 [j/N]",
+        nb = "%0 [j/N]: ",
+        se = "%0 [j/N]: ",
     };
 
     -- stdio UI plugin says this for yes/no/always/never prompts.
     -- "%0" is the question the user is being asked to respond to.
-    ["%0\n[y/n/Always/Never]: "] = {
-        de = "%0\n[j/n/Immer/Niemals]",
-        nb = "%0\n[j/n/Alltid/Aldri]: ",
-        se = "%0\n[j/n/Alltid/Aldrig]: ",
+    ["%0 [y/n/Always/Never]: "] = {
+        de = "%0 [j/n/Immer/Niemals]",
+        nb = "%0 [j/n/Alltid/Aldri]: ",
+        se = "%0 [j/n/Alltid/Aldrig]: ",
     };
 
     -- This is used for "yes" in stdio UI's yes/no prompts (case insensitive).