Display info about how long rooms (both standard and persistant) are kept

master
Daniel Berteaud 11 years ago
parent 6c796f1a15
commit 05131716a6
  1. 8
      lib/Vroom/I18N/en.pm
  2. 11
      lib/Vroom/I18N/fr.pm
  3. 11
      templates/default/join.html.ep

@ -100,9 +100,11 @@ our %Lexicon = (
"PASSWORDS_DO_NOT_MATCH" => "Passwords do not match", "PASSWORDS_DO_NOT_MATCH" => "Passwords do not match",
"MAKE_THIS_ROOM_PERSISTENT" => "Make this room persistent", "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, " . "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 " . "it'll grant you access to the configuration menus next time you connect.",
"password is set, this room will be considered persistent, which means it won't be " . "STANDARD_ROOMS_EXPIRE_AFTER_d" => "A standard room will be deleted after %d hour(s) without activity",
"deleted even if it's not used for some time", "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", "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", "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", "ERROR_COMMON_ROOM_NAME" => "Sorry, this room name is too comon to be reserved",

@ -107,11 +107,12 @@ our %Lexicon = (
"PASSWORDS_DO_NOT_MATCH" => "Les mots de passe ne correspondent pas", "PASSWORDS_DO_NOT_MATCH" => "Les mots de passe ne correspondent pas",
"MAKE_THIS_ROOM_PERSISTENT" => "Rendre ce salon persistant", "MAKE_THIS_ROOM_PERSISTENT" => "Rendre ce salon persistant",
"SET_OWNER_PASS_PERSISTENT" => "Pour rendre ce salon persistant, vous devez saisir un mot de passe " . "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 " . "de gestionnaire. Conservez le soigneusement, il vous permettra de retrouver " .
"permettra de retrouver l'accès aux menus de configuration si vous vous reconnectez " . "l'accès aux menus de configuration quand vous vous reconnectez.",
"plus tard. Une fois ce mot de passe saisi, ce salon sera considéré comme un salon " . "STANDARD_ROOMS_EXPIRE_AFTER_d" => "Un salon classique sera détruit après %d heure(s) sans activité",
"persistant, c'est-à-dire qu'il ne sera pas supprimé, même s'il n'est pas utilisé " . "PERSISTENT_ROOMS" => "Un salon persistant",
"pendant une période prolongée", "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", "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 " . "PROTECT_ROOM_WITH_PASSWORD" => "Si ce mot de passe est configuré, les participants devront le saisir avant de pouvoir " .
"rejoindre le salon", "rejoindre le salon",

@ -289,6 +289,17 @@
<form class="form-horizontal" role="form" id="persistentForm"> <form class="form-horizontal" role="form" id="persistentForm">
<p> <p>
<%=l 'SET_OWNER_PASS_PERSISTENT' %> <%=l 'SET_OWNER_PASS_PERSISTENT' %>
<ul>
<li><%= sprintf($self->l('STANDARD_ROOMS_EXPIRE_AFTER_d'), int($config->{inactivityTimeout}/3600)) %></li>
<li>
<%=l 'PERSISTENT_ROOMS' %>
<% if ($config->{persistentInactivityTimeout} > 0){ %>
<%= sprintf($self->l('EXPIRE_AFTER_d'), int($config->{persistentInactivityTimeout}/(3600*24))) %>
<% } else{ %>
<%=l 'WILL NEVER_EXPIRE' %>
<% } %>
</li>
</ul>
</p> </p>
<div class="form-group"> <div class="form-group">
<label for="ownerPass" class="col-sm-4 control-label"> <label for="ownerPass" class="col-sm-4 control-label">

Loading…
Cancel
Save