diff options
| -rw-r--r-- | app/i18n/en.php | 2 | ||||
| -rw-r--r-- | app/i18n/fr.php | 2 | ||||
| -rw-r--r-- | app/views/configure/reading.phtml | 2 | ||||
| -rw-r--r-- | p/scripts/main.js | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/i18n/en.php b/app/i18n/en.php index 569903782..9ca5098e5 100644 --- a/app/i18n/en.php +++ b/app/i18n/en.php @@ -265,7 +265,7 @@ return array ( 'img_with_lazyload' => 'Use "lazy load" mode to load pictures', 'sticky_post' => 'Stick the article to the top when opened', 'auto_read_when' => 'Mark article as read…', - 'article_selected' => 'when article is selected', + 'article_viewed' => 'when article is view', 'article_open_on_website' => 'when article is opened on its original website', 'scroll' => 'during page scrolls', 'upon_reception' => 'upon reception of the article', diff --git a/app/i18n/fr.php b/app/i18n/fr.php index 5fc60bd15..c43e2611b 100644 --- a/app/i18n/fr.php +++ b/app/i18n/fr.php @@ -265,7 +265,7 @@ return array ( 'img_with_lazyload' => 'Utiliser le mode “chargement différé” pour les images', 'sticky_post' => 'Aligner l’article en haut quand il est ouvert', 'auto_read_when' => 'Marquer un article comme lu…', - 'article_selected' => 'lorsque l’article est sélectionné', + 'article_viewed' => 'lorsque l’article est affiché', 'article_open_on_website' => 'lorsque l’article est ouvert sur le site d’origine', 'scroll' => 'au défilement de la page', 'upon_reception' => 'dès la réception du nouvel article', diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml index 456ab9522..3da2ecadb 100644 --- a/app/views/configure/reading.phtml +++ b/app/views/configure/reading.phtml @@ -87,7 +87,7 @@ <div class="group-controls"> <label class="checkbox" for="check_open_article"> <input type="checkbox" name="mark_open_article" id="check_open_article" value="1"<?php echo $this->conf->mark_when['article'] ? ' checked="checked"' : ''; ?> /> - <?php echo Minz_Translate::t ('article_selected'); ?> + <?php echo Minz_Translate::t ('article_viewed'); ?> </label> <label class="checkbox" for="check_open_site"> <input type="checkbox" name="mark_open_site" id="check_open_site" value="1"<?php echo $this->conf->mark_when['site'] ? ' checked="checked"' : ''; ?> /> diff --git a/p/scripts/main.js b/p/scripts/main.js index afc01ee75..54ee7f0fd 100644 --- a/p/scripts/main.js +++ b/p/scripts/main.js @@ -258,7 +258,7 @@ function toggleContent(new_active, old_active) { } } - if (auto_mark_article) { + if (auto_mark_article && new_active.hasClass('active')) { mark_read(new_active, true); } } |