From 05131716a6b9510d72f2bc5e34d0469a35cbd8a8 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Fri, 30 May 2014 10:12:11 +0200 Subject: [PATCH] Display info about how long rooms (both standard and persistant) are kept --- lib/Vroom/I18N/en.pm | 8 +++++--- lib/Vroom/I18N/fr.pm | 11 ++++++----- templates/default/join.html.ep | 11 +++++++++++ 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/lib/Vroom/I18N/en.pm b/lib/Vroom/I18N/en.pm index 1234d89..ae90059 100644 --- a/lib/Vroom/I18N/en.pm +++ b/lib/Vroom/I18N/en.pm @@ -100,9 +100,11 @@ our %Lexicon = ( "PASSWORDS_DO_NOT_MATCH" => "Passwords do not match", "MAKE_THIS_ROOM_PERSISTENT" => "Make this room persistent", "SET_OWNER_PASS_PERSISTENT" => "To make this room persistent, you must set a manager password. Keep it carefully, " . - "it'll let you access all the configuration menus next time you connect. Once this " . - "password is set, this room will be considered persistent, which means it won't be " . - "deleted even if it's not used for some time", + "it'll grant you access to the configuration menus next time you connect.", + "STANDARD_ROOMS_EXPIRE_AFTER_d" => "A standard room will be deleted after %d hour(s) without activity", + "PERSISTENT_ROOMS" => "A persistant room", + "EXPIRE_AFTER_d" => "will be deleted after %d day(s) without activity", + "NEVER_EXPIRE" => "will be kept forever", "CONFIRM_PASSWORD" => "Confirm password", "PROTECT_ROOM_WITH_PASSWORD" => "If this password is set, participants will have to type it before the system let them in", "ERROR_COMMON_ROOM_NAME" => "Sorry, this room name is too comon to be reserved", diff --git a/lib/Vroom/I18N/fr.pm b/lib/Vroom/I18N/fr.pm index ddc0b36..cca1c2c 100644 --- a/lib/Vroom/I18N/fr.pm +++ b/lib/Vroom/I18N/fr.pm @@ -107,11 +107,12 @@ our %Lexicon = ( "PASSWORDS_DO_NOT_MATCH" => "Les mots de passe ne correspondent pas", "MAKE_THIS_ROOM_PERSISTENT" => "Rendre ce salon persistant", "SET_OWNER_PASS_PERSISTENT" => "Pour rendre ce salon persistant, vous devez saisir un mot de passe " . - "de gestionnaire. Conservez soigneusement ce mot de passe, il vous " . - "permettra de retrouver l'accès aux menus de configuration si vous vous reconnectez " . - "plus tard. Une fois ce mot de passe saisi, ce salon sera considéré comme un salon " . - "persistant, c'est-à-dire qu'il ne sera pas supprimé, même s'il n'est pas utilisé " . - "pendant une période prolongée", + "de gestionnaire. Conservez le soigneusement, il vous permettra de retrouver " . + "l'accès aux menus de configuration quand vous vous reconnectez.", + "STANDARD_ROOMS_EXPIRE_AFTER_d" => "Un salon classique sera détruit après %d heure(s) sans activité", + "PERSISTENT_ROOMS" => "Un salon persistant", + "EXPIRE_AFTER_d" => "sera détruit après %d jour(s) sans activité", + "NEVER_EXPIRE" => "est conservé indéfiniement", "CONFIRM_PASSWORD" => "Confirmation du mot de passe", "PROTECT_ROOM_WITH_PASSWORD" => "Si ce mot de passe est configuré, les participants devront le saisir avant de pouvoir " . "rejoindre le salon", diff --git a/templates/default/join.html.ep b/templates/default/join.html.ep index c5b43bb..4f77d5f 100644 --- a/templates/default/join.html.ep +++ b/templates/default/join.html.ep @@ -289,6 +289,17 @@

<%=l 'SET_OWNER_PASS_PERSISTENT' %> +