Commit 51816d36 authored by Andrew Price's avatar Andrew Price
Browse files

Minor string fix-ups in client/edit.c

parent d5fffd21

src/client/edit.c

+21 −21
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ void edit_user(const char *args, const char *name) 
		show_fold_groups(usr->groups, stats, true);

		oldstats = strdup(stats);

		printf(_("User currently in groups [%s]\n"),oldstats);

		printf(_("New Groups [+-=][12345678]: "));

		printf(_("New groups [+-=][12345678]: "));

		get_str(stats,10);

		if (*stats)

		{
@@ -327,7 +327,7 @@ void edit_user(const char *args, const char *name) 
		char pass1[PASSWDSIZE+1],pass2[PASSWDSIZE+1];

		char salt[3];

		pick_salt(salt);

		strcpy(pass1,crypt(get_pass(_("New Passwd: ")),salt));

		strcpy(pass1,crypt(get_pass(_("New password: ")),salt));

		strcpy(pass2,crypt(get_pass(_("Again: ")),salt));

		if (strcmp(pass1,pass2))

		{
@@ -348,7 +348,7 @@ void edit_user(const char *args, const char *name) 
		char *oldreal;



		oldreal = strdup(usr->realname);

		printf(_("Real Name: %s\n"),oldreal);

		printf(_("Real name: %s\n"),oldreal);

		printf(_("Enter new name (%d chars): "),REALNAMESIZE);

		get_str(realname,REALNAMESIZE);

		if (*realname)
@@ -371,19 +371,19 @@ void edit_user(const char *args, const char *name) 


		oldroom = usr->room;

		printf(_("User currently in room [%d]\n"),oldroom);

		printf(_("New Room: [0-65535]: "));

		printf(_("New room: [0-65535]: "));

		get_str(room,5);

		if (*room)

		{

			if (sscanf(room,"%d",&newroom)!=1)

			{

				printf(_("Invalid Room ID (0-65535 only)\n"));

				printf(_("Invalid room ID (0-65535 only)\n"));

				return;

			}



			if (newroom<0 || newroom>65535)

			{

				printf(_("Invalid Room ID (0-65535 only)\n"));

				printf(_("Invalid room ID (0-65535 only)\n"));

				return;

			}

			usr->room = (unsigned short)newroom;
@@ -401,7 +401,7 @@ void edit_user(const char *args, const char *name) 
		char oldname[NAMESIZE+1];



		printf(_("WARNING: This command can be very dangerous !\n"));

		printf(_("User Name: %s\n"), usr->name);

		printf(_("User name: %s\n"), usr->name);

		printf(_("Enter new username (%d chars): "),NAMESIZE);

		get_str(username,NAMESIZE);
@@ -436,9 +436,9 @@ void edit_user(const char *args, const char *name) 
				          user->record.name, oldname, username);

				mwlog("CHANGE(USERNAME) of %s to %s", oldname, username);

			}else

				printf(_("Change Cancelled.\n"));

				printf(_("Change cancelled.\n"));

		}else

			printf(_("Change Cancelled.\n"));

			printf(_("Change cancelled.\n"));

	}else

	if (stringcmp(args,"contact",2))

	{
@@ -459,8 +459,8 @@ void edit_user(const char *args, const char *name) 
	if (stringcmp(args,"doing",2))

	{

		char doing[DOINGSIZE];

		printf(_("Current Status: %s\n"), usr->doing);

		printf(_("New Status (%d chars): "),DOINGSIZE-1);

		printf(_("Current status: %s\n"), usr->doing);

		printf(_("New status (%d chars): "),DOINGSIZE-1);

		get_str(doing,DOINGSIZE-1);

		if (*doing)

		{
@@ -583,13 +583,13 @@ void edit_user(const char *args, const char *name) 
		else

			printf(_("Timeout set to %s.\n"), itime(usr->timeout));

		timeon = usr->lastlogout;

		printf(_("Last Login: %s"), ctime(&timeon));

		printf(_("Last login: %s"), ctime(&timeon));

		time_on(usr->timeused);

		if (usr->dowhen != 0 && usr->doing[0] != 0)

		printf(_("Status: %s (%s ago)\n"), usr->doing, itime(time(0) - usr->dowhen));

	}else

	{

		printf(_("Unknown Command\n"));

		printf(_("Unknown command\n"));

		return;

	}

	update_user(&u);
@@ -694,7 +694,7 @@ void edit_folder(const char *args, const char *name) 
	}else

	if (stringcmp(args,"size",4))

	{

		printf(_("First Message in folder is %d\n"),fold.first);

		printf(_("First message in folder is %d\n"),fold.first);

		printf(_("New first message: "));

		get_str(tmp,10);

		if (*tmp)
@@ -702,8 +702,8 @@ void edit_folder(const char *args, const char *name) 
			fold.first=atoi(tmp);

			printf(_("First message set to %d\n"),fold.first);

		}

		printf(_("Last Message in folder is %d\n"),fold.last);

		printf(_("New Last message: "));

		printf(_("Last message in folder is %d\n"),fold.last);

		printf(_("New last message: "));

		get_str(tmp,10);

		if (*tmp)

		{
@@ -751,11 +751,11 @@ void edit_folder(const char *args, const char *name) 
			fold.g_status=0;

			fold.name[0]=0;

			users_lastread(folnum);

			printf(_("Folder Deleted.\n"));

			printf(_("Folder deleted.\n"));

			mwlog("FOLDER(DELETE) %s", fold.name);

		}else

		{

			printf(_("Not Done.\n"));

			printf(_("Not done.\n"));

			return;

		}

	}else
@@ -890,7 +890,7 @@ void mesg_edit(const char *args, struct folder *folder, int msgno, struct user * 
			printf(_("Message now to '%s'\n"),foo);

			strcpy(head.to,foo);

		}else

			printf(_("Not Done.\n"));

			printf(_("Not done.\n"));

	}else

	if (stringcmp(args,"subject",3))

	{
@@ -903,7 +903,7 @@ void mesg_edit(const char *args, struct folder *folder, int msgno, struct user * 
			printf(_("Subject '%s'\n"),foo);

			strcpy(head.subject,foo);

		}else

			printf(_("Not Done.\n"));

			printf(_("Not done.\n"));

	}else

	if (stringcmp(args,"delete",3))

	{
@@ -951,7 +951,7 @@ void time_on(long u) 
	m=m/60;

	s=u%60;



	printf(_("Total Login Time of "));

	printf(_("Total login time of "));

	if (d>0)

		printf(_("%d day%s, "),d,d>1?"s":"");

	if (h>0)