From ebfdf68d15824070d6f435c1e3efec58b1fe84a0 Mon Sep 17 00:00:00 2001
From: Antonin <antonin.murtin@gmail.com>
Date: Sat, 5 Mar 2016 18:02:22 +0100
Subject: [PATCH] =?UTF-8?q?Libell=C3=A9s=20chang=C3=A9s=20pour=20la=20modi?=
=?UTF-8?q?fication=20des=20votes=20du=20sondage.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fixes #119
---
locale/de.json | 3 ---
locale/en.json | 3 ---
locale/es.json | 3 ---
locale/fr.json | 5 +----
locale/it.json | 3 ---
locale/oc.json | 3 ---
tpl/part/poll_info.tpl | 14 +++++++-------
7 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/locale/de.json b/locale/de.json
index 06ba5214..f4466b11 100644
--- a/locale/de.json
+++ b/locale/de.json
@@ -119,9 +119,6 @@
"Poll rules": "Regeln der Umfrage",
"Edit the poll rules": "Regeln der Umfrage bearbeiten",
"Votes and comments are locked": "Wertungen und Kommentare sind gesperrt",
- "Votes and comments are open": "Wertungen und Kommentare sind erlaubt",
- "Votes are editable": "Die Wertungen können geändert werden",
- "Votes are editable solely by their owner.": "Wertungen können nur vom Urheber geändert werden",
"Save the new rules": "Neue Regeln speichern",
"Cancel the rules edit": "Abbruch, Regeln nicht ändern",
"Results are hidden.": "Ergebnisse werden ausgeblendet.",
diff --git a/locale/en.json b/locale/en.json
index d3bad3b7..843b673a 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -119,9 +119,6 @@
"Poll rules": "Poll rules",
"Edit the poll rules": "Edit the poll rules",
"Votes and comments are locked": "Votes and comments are locked",
- "Votes and comments are open": "Votes and comments are open",
- "Votes are editable": "Votes are modifiable",
- "Votes are editable solely by their owner.": "Votes can only be edited by their owner",
"Save the new rules": "Save the new rules",
"Cancel the rules edit": "Cancel the rules edit",
"Results are hidden.": "Results are hidden.",
diff --git a/locale/es.json b/locale/es.json
index a6822afc..18309976 100644
--- a/locale/es.json
+++ b/locale/es.json
@@ -119,9 +119,6 @@
"Poll rules": "ES_Permissions du sondage",
"Edit the poll rules": "ES_Modifier les permissions du sondage",
"Votes and comments are locked": "ES_Les votes et commentaires sont verrouillés",
- "Votes and comments are open": "ES_Les votes et commentaires sont ouverts",
- "Votes are editable": "ES_Les votes sont modifiables",
- "Votes are editable solely by their owner.": "ES_Les votes sont modifiables uniquement par leur créateur",
"Save the new rules": "ES_Enregistrer les nouvelles permissions",
"Cancel the rules edit": "ES_Annuler le changement de permissions",
"Results are hidden.": "ES_Les résultats sont cachés.",
diff --git a/locale/fr.json b/locale/fr.json
index 0589acc0..0bb78150 100644
--- a/locale/fr.json
+++ b/locale/fr.json
@@ -118,10 +118,7 @@
"Cancel the expiration date edit": "Annuler le changement de date d'expiration",
"Poll rules": "Permissions du sondage",
"Edit the poll rules": "Modifier les permissions du sondage",
- "Votes and comments are locked": "Les votes et commentaires sont verrouillés",
- "Votes and comments are open": "Les votes et commentaires sont ouverts",
- "Votes are editable": "Les votes sont modifiables",
- "Votes are editable solely by their owner.": "Les votes sont modifiables uniquement par leur créateur",
+ "Votes and comments are locked": "Il n'est plus possible de voter.",
"Save the new rules": "Enregistrer les nouvelles permissions",
"Cancel the rules edit": "Annuler le changement de permissions",
"Results are hidden.": "Les résultats sont cachés.",
diff --git a/locale/it.json b/locale/it.json
index 73c20788..2c9a3b8c 100644
--- a/locale/it.json
+++ b/locale/it.json
@@ -119,9 +119,6 @@
"Poll rules": "Permessi del sondaggio",
"Edit the poll rules": "Modificare i permessi del sondaggio",
"Votes and comments are locked": "I voti e i commenti sono bloccati",
- "Votes and comments are open": "I voti e i commenti sono permessi",
- "Votes are editable": " I voti sono modificabili",
- "Votes are editable solely by their owner.": "Voti sono scrivibili solo dal loro creatore",
"Save the new rules": "Salvare i nuovi permessi",
"Cancel the rules edit": "Annullare le modifica dei permessi",
"Results are hidden.": "I risultati sono nascosti.",
diff --git a/locale/oc.json b/locale/oc.json
index f3660f14..8041655b 100644
--- a/locale/oc.json
+++ b/locale/oc.json
@@ -117,9 +117,6 @@
"Poll rules": "Permissions del sondatge",
"Edit the poll rules": "Modificar las permissions del sondatge",
"Votes and comments are locked": "Los vòtes e comentaris son clavats",
- "Votes and comments are open": "Los vòtes e comentaris son doberts",
- "Votes are editable": "Los vòtes son modificables",
- "Votes are editable solely by their owner.": "Los vòtes son solament modificables pel creator",
"Save the new rules": "Enregistrar las nòvas permissions",
"Cancel the rules edit": "Anullar lo cambi de permissions",
"Results are hidden.": "Las resultats son amagadas.",
diff --git a/tpl/part/poll_info.tpl b/tpl/part/poll_info.tpl
index e2e46070..1dc5c03e 100644
--- a/tpl/part/poll_info.tpl
+++ b/tpl/part/poll_info.tpl
@@ -183,16 +183,16 @@
{if $poll->editable}
{if $poll->editable == constant("Framadate\Editable::EDITABLE_BY_ALL")}
{$rule_id = 2}
- {$rule_txt = __('PollInfo', 'Votes are editable')}
+ {$rule_txt = __('Step 1', 'All voters can modify any vote')}
{else}
{$rule_id = 3}
- {$rule_txt = __('PollInfo', 'Votes are editable solely by their owner.')}
+ {$rule_txt = __('Step 1', 'Voters can modify their vote themselves')}
{/if}
{$rule_icon = '<span class="glyphicon glyphicon-edit"></span>'}
- {else}
+ {else}
{$rule_id = 1}
{$rule_icon = '<span class="glyphicon glyphicon-check"></span>'}
- {$rule_txt = __('PollInfo', 'Votes and comments are open')}
+ {$rule_txt = __('Step 1', 'Votes cannot be modified.')}
{/if}
{else}
{$rule_id = 0}
@@ -206,9 +206,9 @@
<div class="input-group">
<select class="form-control" id="rules" name="rules">
<option value="0"{if $rule_id==0} selected="selected"{/if}>{__('PollInfo', 'Votes and comments are locked')}</option>
- <option value="1"{if $rule_id==1} selected="selected"{/if}>{__('PollInfo', 'Votes and comments are open')}</option>
- <option value="2"{if $rule_id==2} selected="selected"{/if}>{__('PollInfo', 'Votes are editable')}</option>
- <option value="3"{if $rule_id==3} selected="selected"{/if}>{__('PollInfo', 'Votes are editable solely by their owner.')}</option>
+ <option value="1"{if $rule_id==1} selected="selected"{/if}>{__('Step 1', 'Votes cannot be modified.')}</option>
+ <option value="3"{if $rule_id==3} selected="selected"{/if}>{__('Step 1', 'Voters can modify their vote themselves')}</option>
+ <option value="2"{if $rule_id==2} selected="selected"{/if}>{__('Step 1', 'All voters can modify any vote')}</option>
</select>
<span class="input-group-btn">
<button type="submit" name="update_poll_info" value="rules" class="btn btn-success" title="{__('PollInfo', 'Save the new rules')}"><span class="glyphicon glyphicon-ok"></span><span class="sr-only">{__('Generic', 'Save')}</span></button>
--
GitLab