From: Karel Zak <kzak@redhat.com>
Date: Fri, 12 Dec 2008 13:33:29 +0000 (+0100)
Subject: Revert "login-utils: several strings without gettext calls"
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad067f162595be1e8cb0d4fbb88899745674968a;p=util-linux

Revert "login-utils: several strings without gettext calls"

This reverts commit 64fefaf5bffdd4041190f1e5ed4b5d0100638c0d.

It does not make sense to localize config options (wdays in
checktty.c) and debug messages (main() in checktty.c.
---

diff --git a/login-utils/agetty.c b/login-utils/agetty.c
index 47dfa49f..8c5de6ef 100644
--- a/login-utils/agetty.c
+++ b/login-utils/agetty.c
@@ -890,13 +890,11 @@ do_prompt(op, tp)
 		  case 'd':
 		  case 't':
 		    {
-		      char *weekday[] = { N_("Sun"), N_("Mon"), N_("Tue"),
-					  N_("Wed"), N_("Thu"), N_("Fri"),
-					  N_("Sat") };
-		      char *month[] = { N_("Jan"), N_("Feb"), N_("Mar"),
-					N_("Apr"), N_("May"), N_("Jun"),
-					N_("Jul"), N_("Aug"), N_("Sep"),
-					N_("Oct"), N_("Nov"), N_("Dec") };
+		      char *weekday[] = { "Sun", "Mon", "Tue", "Wed", "Thu",
+					  "Fri", "Sat" };
+		      char *month[] = { "Jan", "Feb", "Mar", "Apr", "May",
+					"Jun", "Jul", "Aug", "Sep", "Oct",
+					"Nov", "Dec" };
 		      time_t now;
 		      struct tm *tm;
 
diff --git a/login-utils/checktty.c b/login-utils/checktty.c
index b79f7bd6..c28ee833 100644
--- a/login-utils/checktty.c
+++ b/login-utils/checktty.c
@@ -316,7 +316,7 @@ main(int argc, char **argv)
 
 	for (item = alist; item->range; item++) {
 
-		printf(_("hnmatch() on %-30s <-- %-15s: "), item->range, item->ip);
+		printf("hnmatch() on %-30s <-- %-15s: ", item->range, item->ip);
 
 		if (getaddrinfo(item->ip, NULL, &hints, &info)==0 && info) {
 			if (info->ai_family == AF_INET)	{
@@ -334,18 +334,17 @@ main(int argc, char **argv)
 			hostfamily = info->ai_family;
 			freeaddrinfo(info);
 			printf("%s\n", hnmatch("dummy", item->range) ?
-						_("match") : _("mismatch"));
+						"match" : "mismatch");
 		}
 		else
-			printf(_("getaddrinfo() failed\n"));
+			printf("getaddrinfo() failed\n");
 
 	}
 	return 0;
 }
 #endif /* MAIN_TEST_CHECKTTY */
 
-static char *wdays[] = { N_("sun"), N_("mon"), N_("tue"), N_("wed"),
-			 N_("thu"), N_("fri"), N_("sat") };
+static char *wdays[] = { "sun", "mon", "tue", "wed", "thu", "fri", "sat" };
 
 /* example timespecs:
 
diff --git a/login-utils/chfn.c b/login-utils/chfn.c
index bab3939c..3ca190f1 100644
--- a/login-utils/chfn.c
+++ b/login-utils/chfn.c
@@ -374,10 +374,10 @@ static void ask_info (oldfp, newfp)
     struct finfo *oldfp;
     struct finfo *newfp;
 {
-    newfp->full_name = prompt (_("Name"), oldfp->full_name);
-    newfp->office = prompt (_("Office"), oldfp->office);
-    newfp->office_phone	= prompt (_("Office Phone"), oldfp->office_phone);
-    newfp->home_phone = prompt (_("Home Phone"), oldfp->home_phone);
+    newfp->full_name = prompt ("Name", oldfp->full_name);
+    newfp->office = prompt ("Office", oldfp->office);
+    newfp->office_phone	= prompt ("Office Phone", oldfp->office_phone);
+    newfp->home_phone = prompt ("Home Phone", oldfp->home_phone);
     printf ("\n");
 }
 
diff --git a/login-utils/simpleinit.c b/login-utils/simpleinit.c
index 1e7ba282..739306cf 100644
--- a/login-utils/simpleinit.c
+++ b/login-utils/simpleinit.c
@@ -337,12 +337,12 @@ static int check_single_ok (void)
 
     for (i = 0; i < MAXTRIES; i++)
     {
-	pass = getpass (_("Password: ") );
+	pass = getpass (_ ("Password: ") );
 	if (pass == NULL) continue;
 		
 	if ( !strcmp (crypt (pass, rootpass), rootpass) ) return 1;
 
-	puts (_("\nWrong password.\n") );
+	puts (_ ("\nWrong password.\n") );
     }
     return 0;
 }
@@ -944,7 +944,7 @@ static void process_command (const struct command_struct *command)
 		while (waitpid (pid, &ival, 0) != pid) /*  Nothing  */;
 		if ( WIFEXITED (ival) && (WEXITSTATUS (ival) == 0) )
 		{
-		    sprintf (txt, _("Stopped service: %s\n"),
+		    sprintf (txt, "Stopped service: %s\n",
 			     victim->first_service->name);
 		    remove_entry (&available_list, victim);
 		    free (victim);