summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-10-07 22:47:43 +0200
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-10-07 22:47:43 +0200
commit85e057e79396750601d32a38f94a8fe63d8c3332 (patch)
treeefb1ab992a5cd7c24fe2d6ae5604f4fc6a040c16
parent8f7a630183462cb18892c6217c08f607271fc3be (diff)
Explication du champ token plus concis
-rw-r--r--app/i18n/en.php2
-rw-r--r--app/i18n/fr.php2
-rw-r--r--app/views/configure/display.phtml2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 4ce947346..bd5c7290f 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -153,7 +153,7 @@ return array (
'persona_connection_email' => 'Login mail address (use <a href="https://persona.org/">Persona</a>)',
'allow_anonymous' => 'Allow anonymous reading',
'auth_token' => 'Authentication token',
- 'explain_token' => 'This token allows to avoid authentication by adding it to URL (eg. %s?token=&lt;your_token&gt;). RSS output only.',
+ 'explain_token' => 'Allows to access RSS output without authentication.<br />%s?token=%s',
'reading_configuration' => 'Reading configuration',
'articles_per_page' => 'Number of articles per page',
'default_view' => 'Default view',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 84dec0fa4..17a0fb702 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -153,7 +153,7 @@ return array (
'persona_connection_email' => 'Adresse mail de connexion (utilise <a href="https://persona.org/">Persona</a>)',
'allow_anonymous' => 'Autoriser la lecture anonyme',
'auth_token' => 'Jeton d’identification',
- 'explain_token' => 'Ce jeton permet de s’affranchir d’authentification en l’ajoutant à l’URL (ex. %s?token=&lt;votre_token&gt;). Seul la sortie RSS est concernée.',
+ 'explain_token' => 'Permet d\'accéder à la sortie RSS sans besoin de s\'authentifier.<br />%s?output=rss&token=%s',
'reading_configuration' => 'Configuration de lecture',
'articles_per_page' => 'Nombre d’articles par page',
'default_view' => 'Vue par défaut',
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 3d92a0dfc..0f89437ac 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -56,7 +56,7 @@
<?php $token = $this->conf->token (); ?>
<div class="group-controls">
<input type="text" id="token" name="token" value="<?php echo $token; ?>" placeholder="<?php echo Translate::t ('blank_to_disable'); ?>"/>
- <i class="icon i_help"></i> <?php echo Translate::t('explain_token', Url::display()); ?>
+ <i class="icon i_help"></i> <?php echo Translate::t('explain_token', Url::display(), $token); ?>
</div>
</div>