brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

end-session-dialog: Use correct plural forms for timeouts

Browse Source 
All end-session dialogs need to use ngettext for their timeout
strings, fix this.

https://bugzilla.gnome.org/show_bug.cgi?id=639987
This commit is contained in:
Florian Müllner 2011-09-07 13:34:48 +02:00
parent e81cee3949
commit a4eb3c17eb
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
js/ui/endSessionDialog.js
View File

@ -60,8 +60,16 @@ const logoutDialogContent = {
subjectWithUser: _("Log Out %s"), subjectWithUser: _("Log Out %s"),
subject: _("Log Out"), subject: _("Log Out"),
inhibitedDescription: _("Click Log Out to quit these applications and log out of the system."), inhibitedDescription: _("Click Log Out to quit these applications and log out of the system."),
uninhibitedDescriptionWithUser: _("%s will be logged out automatically in %d seconds."), uninhibitedDescriptionWithUser: function(user, seconds) {
uninhibitedDescription: _("You will be logged out automatically in %d seconds."), return ngettext("%s will be logged out automatically in %d second.",
"%s will be logged out automatically in %d seconds.",
seconds).format(user, seconds);
},
uninhibitedDescription: function(seconds) {
return ngettext("You will be logged out automatically in %d second.",
"You will be logged out automatically in %d seconds.",
seconds).format(seconds);
},
endDescription: _("Logging out of the system."), endDescription: _("Logging out of the system."),
confirmButtons: [{ signal: 'ConfirmedLogout', confirmButtons: [{ signal: 'ConfirmedLogout',
label: _("Log Out") }], label: _("Log Out") }],
@ -71,7 +79,11 @@ const logoutDialogContent = {
const shutdownDialogContent = { const shutdownDialogContent = {
subject: _("Power Off"), subject: _("Power Off"),
inhibitedDescription: _("Click Power Off to quit these applications and power off the system."), inhibitedDescription: _("Click Power Off to quit these applications and power off the system."),
uninhibitedDescription: _("The system will power off automatically in %d seconds."), uninhibitedDescription: function(seconds) {
return ngettext("The system will power off automatically in %d second.",
"The system will power off automatically in %d seconds.",
seconds).format(seconds);
},
endDescription: _("Powering off the system."), endDescription: _("Powering off the system."),
confirmButtons: [{ signal: 'ConfirmedReboot', confirmButtons: [{ signal: 'ConfirmedReboot',
label: _("Restart") }, label: _("Restart") },
@ -84,7 +96,11 @@ const shutdownDialogContent = {
const restartDialogContent = { const restartDialogContent = {
subject: _("Restart"), subject: _("Restart"),
inhibitedDescription: _("Click Restart to quit these applications and restart the system."), inhibitedDescription: _("Click Restart to quit these applications and restart the system."),
uninhibitedDescription: _("The system will restart automatically in %d seconds."), uninhibitedDescription: function(seconds) {
return ngettext("The system will restart automatically in %d second.",
"The system will restart automatically in %d seconds.",
seconds).format(seconds);
},
endDescription: _("Restarting the system."), endDescription: _("Restarting the system."),
confirmButtons: [{ signal: 'ConfirmedReboot', confirmButtons: [{ signal: 'ConfirmedReboot',
label: _("Restart") }], label: _("Restart") }],
@ -388,14 +404,14 @@ EndSessionDialog.prototype = {
subject = dialogContent.subjectWithUser.format(realName); subject = dialogContent.subjectWithUser.format(realName);
if (dialogContent.uninhibitedDescriptionWithUser) if (dialogContent.uninhibitedDescriptionWithUser)
description = dialogContent.uninhibitedDescriptionWithUser.format(realName, displayTime); description = dialogContent.uninhibitedDescriptionWithUser(realName, displayTime);
else else
description = dialogContent.uninhibitedDescription.format(displayTime); description = dialogContent.uninhibitedDescription(displayTime);
} }
} }
if (!description) if (!description)
description = dialogContent.uninhibitedDescription.format(displayTime); description = dialogContent.uninhibitedDescription(displayTime);
} else { } else {
description = dialogContent.endDescription; description = dialogContent.endDescription;
} }