aboutsummaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
Diffstat (limited to 'app/views')
-rw-r--r--app/views/configure/categorize.phtml20
-rw-r--r--app/views/configure/display.phtml66
-rw-r--r--app/views/configure/feed.phtml47
-rw-r--r--app/views/configure/importExport.phtml12
-rw-r--r--app/views/configure/shortcut.phtml30
-rw-r--r--app/views/entry/note.phtml24
-rw-r--r--app/views/error/index.phtml7
-rwxr-xr-xapp/views/helpers/pagination.phtml19
-rwxr-xr-xapp/views/helpers/rss.phtml2
-rw-r--r--app/views/index/about.phtml24
-rw-r--r--app/views/index/index.phtml72
-rw-r--r--app/views/javascript/actualize.phtml2
12 files changed, 172 insertions, 153 deletions
diff --git a/app/views/configure/categorize.phtml b/app/views/configure/categorize.phtml
index 660ddef20..b6ba5c3c7 100644
--- a/app/views/configure/categorize.phtml
+++ b/app/views/configure/categorize.phtml
@@ -1,23 +1,23 @@
<?php $this->partial ('aside_configure'); ?>
<div class="post">
- <a href="<?php echo _url ('index', 'index'); ?>">← Retour à vos flux RSS</a>
+ <a href="<?php echo _url ('index', 'index'); ?>"><?php echo Translate::t ('back_to_rss_feeds'); ?></a>
<form method="post" action="<?php echo _url ('configure', 'categorize'); ?>">
- <legend>Gestion des catégories - <a href="<?php echo _url ('configure', 'feed'); ?>">gestion des flux</a></legend>
+ <legend><?php echo Translate::t ('categories_management'); ?> - <a href="<?php echo _url ('configure', 'feed'); ?>"><?php echo Translate::t ('rss_feed_management'); ?></a></legend>
- <p class="alert alert-warn">Lors de la suppression d'une catégorie, ses flux seront automatiquement classés dans <em><?php echo $this->defaultCategory->name (); ?></em>.</p>
+ <p class="alert alert-warn"><?php echo Translate::t ('feeds_moved_category_deleted', $this->defaultCategory->name ()); ?></p>
<?php $i = 0; foreach ($this->categories as $cat) { $i++; ?>
<div class="form-group">
<label class="group-name" for="cat_<?php echo $cat->id (); ?>">
- Catégorie n°<?php echo $i; ?>
+ <?php echo Translate::t ('category_number', $i); ?>
</label>
<div class="group-controls">
<input type="text" id="cat_<?php echo $cat->id (); ?>" name="categories[]" value="<?php echo $cat->name (); ?>" />
- <a href="<?php echo _url ('feed', 'delete', 'id', $cat->id (), 'type', 'category'); ?>">Vider ?</a> (<?php echo $cat->nbFeed (); ?> flux)
+ <a href="<?php echo _url ('feed', 'delete', 'id', $cat->id (), 'type', 'category'); ?>"><?php echo Translate::t ('ask_empty'); ?></a> (<?php echo Translate::t ('number_feeds', $cat->nbFeed ()); ?>)
<?php if ($cat->id () == $this->defaultCategory->id ()) { ?>
- <i class="icon i_help"></i> ne peut pas être supprimée
+ <i class="icon i_help"></i> <?php echo Translate::t ('can_not_be_deleted'); ?>
<?php } ?>
<input type="hidden" name="ids[]" value="<?php echo $cat->id (); ?>" />
</div>
@@ -25,16 +25,16 @@
<?php } ?>
<div class="form-group">
- <label class="group-name" for="new_category">Ajouter une catégorie</label>
+ <label class="group-name" for="new_category"><?php echo Translate::t ('add_category'); ?></label>
<div class="group-controls">
- <input type="text" id="new_category" name="new_category" placeholder="Nouvelle catégorie" />
+ <input type="text" id="new_category" name="new_category" placeholder="<?php echo Translate::t ('new_category'); ?>" />
</div>
</div>
<div class="form-group form-actions">
<div class="group-controls">
- <button type="submit" class="btn btn-important">Sauvegarder</button>
- <button type="reset" class="btn">Annuler</button>
+ <button type="submit" class="btn btn-important"><?php echo Translate::t ('save'); ?></button>
+ <button type="reset" class="btn"><?php echo Translate::t ('cancel'); ?></button>
</div>
</div>
</form>
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 79fa4b43c..be67896dc 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -1,104 +1,116 @@
<?php $this->partial ('aside_configure'); ?>
<div class="post">
- <a href="<?php echo _url ('index', 'index'); ?>">← Retour à vos flux RSS</a>
+ <a href="<?php echo _url ('index', 'index'); ?>"><?php echo Translate::t ('back_to_rss_feeds'); ?></a>
<form method="post" action="<?php echo _url ('configure', 'display'); ?>">
- <legend>Configuration générale</legend>
+ <legend><?php echo Translate::t ('general_configuration'); ?></legend>
<div class="form-group">
- <label class="group-name" for="old_entries">Supprimer les articles tous les</label>
+ <label class="group-name" for="language"><?php echo Translate::t ('language'); ?></label>
<div class="group-controls">
- <input type="number" id="old_entries" name="old_entries" value="<?php echo $this->conf->oldEntries (); ?>" /> mois
+ <select name="language" id="language">
+ <?php $languages = $this->conf->availableLanguages (); ?>
+ <?php foreach ($languages as $short => $lib) { ?>
+ <option value="<?php echo $short; ?>"<?php echo $this->conf->language () == $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
+ <?php } ?>
+ </select>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="group-name" for="old_entries"><?php echo Translate::t ('delete_articles_every'); ?></label>
+ <div class="group-controls">
+ <input type="number" id="old_entries" name="old_entries" value="<?php echo $this->conf->oldEntries (); ?>" /> <?php echo Translate::t ('month'); ?>
</div>
</div>
<div class="form-group">
- <label class="group-name" for="mail_login">Adresse mail de connexion (utilise <a href="https://persona.org/">Persona</a>)</label>
+ <label class="group-name" for="mail_login"><?php echo Translate::t ('persona_connection_email'); ?></label>
<?php $mail = $this->conf->mailLogin (); ?>
<div class="group-controls">
- <input type="email" id="mail_login" name="mail_login" value="<?php echo $mail ? $mail : ''; ?>" placeholder="Laissez vide pour désactiver" />
- <noscript><b>nécessite que javascript soit activé</b></noscript>
+ <input type="email" id="mail_login" name="mail_login" value="<?php echo $mail ? $mail : ''; ?>" placeholder="<?php echo Translate::t ('blank_to_disable'); ?>" />
+ <noscript><b><?php echo Translate::t ('javascript_should_be_activated'); ?></b></noscript>
</div>
</div>
- <legend>Configuration de lecture</legend>
+ <legend><?php echo Translate::t ('reading_configuration'); ?></legend>
<div class="form-group">
- <label class="group-name" for="posts_per_page">Nombre d'articles par page</label>
+ <label class="group-name" for="posts_per_page"><?php echo Translate::t ('articles_per_page'); ?></label>
<div class="group-controls">
<input type="number" id="posts_per_page" name="posts_per_page" value="<?php echo $this->conf->postsPerPage (); ?>" />
</div>
</div>
<div class="form-group">
- <label class="group-name">Vue par défaut</label>
+ <label class="group-name"><?php echo Translate::t ('default_view'); ?></label>
<div class="group-controls">
<label class="radio" for="radio_all">
<input type="radio" name="default_view" id="radio_all" value="all"<?php echo $this->conf->defaultView () == 'all' ? ' checked="checked"' : ''; ?> />
- Tout afficher
+ <?php echo Translate::t ('show_all_articles'); ?>
</label>
<label class="radio" for="radio_not_read">
<input type="radio" name="default_view" id="radio_not_read" value="not_read"<?php echo $this->conf->defaultView () == 'not_read' ? ' checked="checked"' : ''; ?> />
- Afficher les non lus
+ <?php echo Translate::t ('show_not_reads'); ?>
</label>
</div>
</div>
<div class="form-group">
- <label class="group-name" for="sort_order">Ordre de tri</label>
+ <label class="group-name" for="sort_order"><?php echo Translate::t ('sort_order'); ?></label>
<div class="group-controls">
<select name="sort_order" id="sort_order">
- <option value="low_to_high"<?php echo $this->conf->sortOrder () == 'low_to_high' ? ' selected="selected"' : ''; ?>>Du plus récent au plus ancien</option>
- <option value="high_to_low"<?php echo $this->conf->sortOrder () == 'high_to_low' ? ' selected="selected"' : ''; ?>>Du plus ancien au plus récent</option>
+ <option value="low_to_high"<?php echo $this->conf->sortOrder () == 'low_to_high' ? ' selected="selected"' : ''; ?>><?php echo Translate::t ('newer_first'); ?></option>
+ <option value="high_to_low"<?php echo $this->conf->sortOrder () == 'high_to_low' ? ' selected="selected"' : ''; ?>><?php echo Translate::t ('older_first'); ?></option>
</select>
</div>
</div>
<div class="form-group">
- <label class="group-name">Afficher les articles dépliés par défaut</label>
+ <label class="group-name"><?php echo Translate::t ('display_articles_unfolded'); ?></label>
<div class="group-controls">
<label class="radio" for="radio_yes">
<input type="radio" name="display_posts" id="radio_yes" value="yes"<?php echo $this->conf->displayPosts () == 'yes' ? ' checked="checked"' : ''; ?> />
- Oui
+ <?php echo Translate::t ('yes'); ?>
</label>
<label class="radio" for="radio_no">
<input type="radio" name="display_posts" id="radio_no" value="no"<?php echo $this->conf->displayPosts () == 'no' ? ' checked="checked"' : ''; ?> />
- Non<noscript> - <b>nécessite que javascript soit activé</b></noscript>
+ <?php echo Translate::t ('no'); ?><noscript> - <b><?php echo Translate::t ('javascript_should_be_activated'); ?></b></noscript>
</label>
</div>
</div>
<div class="form-group">
- <label class="group-name">Article automatiquement marqué comme lu lorsque</label>
+ <label class="group-name"><?php echo Translate::t ('auto_read_when'); ?></label>
<div class="group-controls">
<label class="checkbox" for="check_open_article">
<input type="checkbox" name="mark_open_article" id="check_open_article" value="yes"<?php echo $this->conf->markWhenArticle () == 'yes' ? ' checked="checked"' : ''; ?> />
- l'article est sélectionné
+ <?php echo Translate::t ('article_selected'); ?>
</label>
<label class="checkbox" for="check_open_site">
<input type="checkbox" name="mark_open_site" id="check_open_site" value="yes"<?php echo $this->conf->markWhenSite () == 'yes' ? ' checked="checked"' : ''; ?> />
- l'article est ouvert sur le site d'origine
+ <?php echo Translate::t ('article_open_on_website'); ?>
</label>
<label class="checkbox" for="check_open_page">
<input type="checkbox" name="mark_open_page" id="check_open_page" value="yes"<?php echo $this->conf->markWhenPage () == 'yes' ? ' checked="checked"' : ''; ?> />
- la page est chargée
+ <?php echo Translate::t ('page_loaded'); ?>
</label>
</div>
</div>
- <legend>Partage</legend>
+ <legend><?php echo Translate::t ('sharing'); ?></legend>
<div class="form-group">
- <label class="group-name" for="shaarli">Votre Shaarli</label>
+ <label class="group-name" for="shaarli"><?php echo Translate::t ('your_shaarli'); ?></label>
<div class="group-controls">
- <input type="text" id="shaarli" name="shaarli" value="<?php echo $this->conf->urlShaarli (); ?>" placeholder="Laissez vide pour désactiver"/>
+ <input type="text" id="shaarli" name="shaarli" value="<?php echo $this->conf->urlShaarli (); ?>" placeholder="<?php echo Translate::t ('blank_to_disable'); ?>"/>
</div>
</div>
<div class="form-group form-actions">
<div class="group-controls">
- <button type="submit" class="btn btn-important">Valider</button>
- <button type="reset" class="btn">Annuler</button>
+ <button type="submit" class="btn btn-important"><?php echo Translate::t ('save'); ?></button>
+ <button type="reset" class="btn"><?php echo Translate::t ('cancel'); ?></button>
</div>
</div>
</form>
diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml
index adea27e52..33483f72d 100644
--- a/app/views/configure/feed.phtml
+++ b/app/views/configure/feed.phtml
@@ -2,35 +2,35 @@
<?php if ($this->flux) { ?>
<div class="post">
- <a href="<?php echo _url ('index', 'index'); ?>">← Retour à vos flux RSS</a>
+ <a href="<?php echo _url ('index', 'index'); ?>"><?php echo Translate::t ('back_to_rss_feeds'); ?></a> <?php echo Translate::t ('or'); ?> <a href="<?php echo _url ('index', 'index', 'get', 'f_' . $this->flux->id ()); ?>"><?php echo Translate::t ('filter'); ?></a>
<h1><?php echo $this->flux->name (); ?></h1>
<?php echo $this->flux->description (); ?>
<form method="post" action="<?php echo _url ('configure', 'feed', 'id', $this->flux->id ()); ?>">
- <legend>Informations</legend>
+ <legend><?php echo Translate::t ('informations'); ?></legend>
<div class="form-group">
- <label class="group-name">URL du site</label>
+ <label class="group-name"><?php echo Translate::t ('website_url'); ?></label>
<div class="group-controls">
<span class="control"><a target="_blank" href="<?php echo $this->flux->website (); ?>"><?php echo $this->flux->website (); ?></a></span>
</div>
</div>
<div class="form-group">
- <label class="group-name">URL du flux</label>
+ <label class="group-name"><?php echo Translate::t ('feed_url'); ?></label>
<div class="group-controls">
<span class="control"><a target="_blank" href="<?php echo $this->flux->url (); ?>"><?php echo $this->flux->url (); ?></a></span>
</div>
</div>
<div class="form-group">
- <label class="group-name">Nombre d'articles</label>
+ <label class="group-name"><?php echo Translate::t ('number_articles'); ?></label>
<div class="group-controls">
<span class="control"><?php echo $this->flux->nbEntries (); ?></span>
</div>
</div>
- <legend>Catégorie - <a href="<?php echo _url ('configure', 'categorize'); ?>">gestion</a></legend>
+ <legend><?php echo Translate::t ('category'); ?> - <a href="<?php echo _url ('configure', 'categorize'); ?>"><?php echo Translate::t ('categories_management'); ?></a></legend>
<div class="form-group">
- <label class="group-name">Ranger dans une catégorie</label>
+ <label class="group-name"><?php echo Translate::t ('categorize'); ?></label>
<div class="group-controls">
<?php foreach ($this->categories as $cat) { ?>
<label class="radio" for="cat_<?php echo $cat->id (); ?>">
@@ -41,46 +41,47 @@
</div>
</div>
- <legend>Avancé</legend>
+ <legend><?php echo Translate::t ('advanced'); ?></legend>
<div class="form-group">
- <label class="group-name" for="priority">Afficher dans le flux principal</label>
+ <label class="group-name" for="priority"><?php echo Translate::t ('show_in_all_flux'); ?></label>
<div class="group-controls">
<label class="checkbox" for="priority">
<input type="checkbox" name="priority" id="priority" value="10"<?php echo $this->flux->priority () > 0 ? ' checked="checked"' : ''; ?> />
- Oui
+ <?php echo Translate::t ('yes'); ?>
</label>
</div>
</div>
<div class="form-group">
- <label class="group-name" for="path_entries">Chemin CSS des articles sur le site d'origine</label>
+ <label class="group-name" for="path_entries"><?php echo Translate::t ('css_path_on_website'); ?></label>
<div class="group-controls">
- <input type="text" name="path_entries" id="path_entries" value="<?php echo $this->flux->pathEntries (); ?>" placeholder="Laissez vide pour désactiver" />
- <i class="icon i_help"></i> Permet de récupérer les flux tronqués (attention, demande plus de temps !)
+ <input type="text" name="path_entries" id="path_entries" value="<?php echo $this->flux->pathEntries (); ?>" placeholder="<?php echo Translate::t ('blank_to_disable'); ?>" />
+ <i class="icon i_help"></i> <?php echo Translate::t ('retrieve_truncated_feeds'); ?>
</div>
</div>
-<!--
+
+ <?php $auth = $this->flux->httpAuth (false); ?>
<div class="form-group">
- <label class="group-name" for="http_user">Username HTTP</label>
+ <label class="group-name" for="http_user"><?php echo Translate::t ('http_username'); ?></label>
<div class="group-controls">
- <input type="text" name="http_user" id="http_user" value="Pas encore implémenté" />
- <i class="icon i_help"></i> La connexion permet d'accéder aux flux protégés par une authentification HTTP
+ <input type="text" name="http_user" id="http_user" value="<?php echo $auth['username']; ?>" />
+ <i class="icon i_help"></i> <?php echo Translate::t ('access_protected_feeds'); ?>
</div>
- <label class="group-name" for="http_pass">Password HTTP</label>
+ <label class="group-name" for="http_pass"><?php echo Translate::t ('http_password'); ?></label>
<div class="group-controls">
- <input type="text" name="http_pass" id="http_pass" value="Pas encore implémenté" />
+ <input type="password" name="http_pass" id="http_pass" value="<?php echo $auth['password']; ?>" />
</div>
</div>
--->
+
<div class="form-group form-actions">
<div class="group-controls">
- <button class="btn btn-important">Valider</button>
- <button class="btn btn-attention" formaction="<?php echo Url::display (array ('c' => 'feed', 'a' => 'delete', 'params' => array ('id' => $this->flux->id ()))); ?>">Supprimer</button>
+ <button class="btn btn-important"><?php echo Translate::t ('save'); ?></button>
+ <button class="btn btn-attention" formaction="<?php echo Url::display (array ('c' => 'feed', 'a' => 'delete', 'params' => array ('id' => $this->flux->id ()))); ?>"><?php echo Translate::t ('delete'); ?></button>
</div>
</div>
</form>
</div>
<?php } else { ?>
-<div class="alert"><span class="alert-head">Aucun flux sélectionné.</span> Pensez à en ajouter !</div>
+<div class="alert alert-warn"><span class="alert-head"><?php echo Translate::t ('no_selected_feed'); ?></span> <?php echo Translate::t ('think_to_add'); ?></div>
<?php } ?>
diff --git a/app/views/configure/importExport.phtml b/app/views/configure/importExport.phtml
index 34bee4a07..4cc575356 100644
--- a/app/views/configure/importExport.phtml
+++ b/app/views/configure/importExport.phtml
@@ -14,12 +14,12 @@
<?php $this->partial ('aside_feed'); ?>
<div class="post ">
- <a href="<?php echo _url ('index', 'index'); ?>">← Retour à vos flux RSS</a>
+ <a href="<?php echo _url ('index', 'index'); ?>"><?php echo Translate::t ('back_to_rss_feeds'); ?></a>
<form method="post" action="<?php echo Url::display (array ('c' => 'configure', 'a' => 'importExport', 'params' => array ('q' => 'import'))); ?>" enctype="multipart/form-data">
- <legend>Import / export au format OPML</legend>
+ <legend><?php echo Translate::t ('import_export_opml'); ?></legend>
<div class="form-group">
- <label class="group-name" for="file">Fichier à importer</label>
+ <label class="group-name" for="file"><?php echo Translate::t ('file_to_import'); ?></label>
<div class="group-controls">
<input type="file" name="file" id="file" />
</div>
@@ -27,9 +27,9 @@
<div class="form-group form-actions">
<div class="group-controls">
- <button type="submit" class="btn btn-important">Importer</button>
- ou
- <a target="_blank" class="btn btn-important" href="<?php echo _url ('configure', 'importExport', 'q', 'export'); ?>">Exporter</a>
+ <button type="submit" class="btn btn-important"><?php echo Translate::t ('import'); ?></button>
+ <?php echo Translate::t ('or'); ?>
+ <a target="_blank" class="btn btn-important" href="<?php echo _url ('configure', 'importExport', 'q', 'export'); ?>"><?php echo Translate::t ('export'); ?></a>
</div>
</div>
</form>
diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml
index 86682465a..4c7884234 100644
--- a/app/views/configure/shortcut.phtml
+++ b/app/views/configure/shortcut.phtml
@@ -1,7 +1,7 @@
<?php $this->partial ('aside_configure'); ?>
<div class="post">
- <a href="<?php echo _url ('index', 'index'); ?>">← Retour à vos flux RSS</a>
+ <a href="<?php echo _url ('index', 'index'); ?>"><?php echo Translate::t ('back_to_rss_feeds'); ?></a>
<datalist id="keys">
<?php foreach ($this->list_keys as $key) { ?>
@@ -12,57 +12,57 @@
<?php $s = $this->conf->shortcuts (); ?>
<form method="post" action="<?php echo _url ('configure', 'shortcut'); ?>">
- <legend>Gestion des raccourcis</legend>
+ <legend><?php echo Translate::t ('shortcuts_management'); ?></legend>
- <noscript><b>Le javascript doit être activé pour pouvoir profiter des raccourcis</b></noscript>
+ <noscript><p class="alert alert-error"><?php echo Translate::t ('javascript_for_shortcuts'); ?></p></noscript>
<div class="form-group">
- <label class="group-name" for="mark_read">Marquer l'article comme lu</label>
+ <label class="group-name" for="mark_read"><?php echo Translate::t ('mark_read'); ?></label>
<div class="group-controls">
<input type="text" id="mark_read" name="shortcuts[mark_read]" list="keys" value="<?php echo $s['mark_read']; ?>" />
- + <code>shift</code> pour marquer tous les articles comme non lus
+ <?php echo Translate::t ('shift_for_all_read'); ?>
</div>
</div>
<div class="form-group">
- <label class="group-name" for="mark_favorite">Mettre l'article en favori</label>
+ <label class="group-name" for="mark_favorite"><?php echo Translate::t ('mark_favorite'); ?></label>
<div class="group-controls">
<input type="text" id="mark_favorite" name="shortcuts[mark_favorite]" list="keys" value="<?php echo $s['mark_favorite']; ?>" />
</div>
</div>
<div class="form-group">
- <label class="group-name" for="go_website">Voir l'article sur le site d'origine</label>
+ <label class="group-name" for="go_website"><?php echo Translate::t ('see_on_website'); ?></label>
<div class="group-controls">
<input type="text" id="go_website" name="shortcuts[go_website]" list="keys" value="<?php echo $s['go_website']; ?>" />
</div>
</div>
<div class="form-group">
- <label class="group-name" for="next_entry">Passer à l'article suivant</label>
+ <label class="group-name" for="next_entry"><?php echo Translate::t ('next_article'); ?></label>
<div class="group-controls">
<input type="text" id="next_entry" name="shortcuts[next_entry]" list="keys" value="<?php echo $s['next_entry']; ?>" />
- + <code>shift</code> pour passer au dernier article de la page
+ <?php echo Translate::t ('shift_for_last'); ?>
</div>
</div>
<div class="form-group">
- <label class="group-name" for="prev_entry">Passer à l'article précédent</label>
+ <label class="group-name" for="prev_entry"><?php echo Translate::t ('previous_article'); ?></label>
<div class="group-controls">
<input type="text" id="prev_entry" name="shortcuts[prev_entry]" list="keys" value="<?php echo $s['prev_entry']; ?>" />
- + <code>shift</code> pour passer au premier article de la page
+ <?php echo Translate::t ('shift_for_first'); ?>
</div>
</div>
<div class="form-group">
- <label class="group-name" for="next_page">Passer à la page suivante</label>
+ <label class="group-name" for="next_page"><?php echo Translate::t ('next_page'); ?></label>
<div class="group-controls">
<input type="text" id="next_page" name="shortcuts[next_page]" list="keys" value="<?php echo $s['next_page']; ?>" />
</div>
</div>
<div class="form-group">
- <label class="group-name" for="prev_page">Passer à la page précédente</label>
+ <label class="group-name" for="prev_page"><?php echo Translate::t ('previous_page'); ?></label>
<div class="group-controls">
<input type="text" id="prev_page" name="shortcuts[prev_page]" list="keys" value="<?php echo $s['prev_page']; ?>" />
</div>
@@ -70,8 +70,8 @@
<div class="form-group form-actions">
<div class="group-controls">
- <button type="submit" class="btn btn-important">Sauvegarder</button>
- <button type="reset" class="btn">Annuler</button>
+ <button type="submit" class="btn btn-important"><?php echo Translate::t ('save'); ?></button>
+ <button type="reset" class="btn"><?php echo Translate::t ('cancel'); ?></button>
</div>
</div>
</form>
diff --git a/app/views/entry/note.phtml b/app/views/entry/note.phtml
index 912d4846d..061060106 100644
--- a/app/views/entry/note.phtml
+++ b/app/views/entry/note.phtml
@@ -1,37 +1,37 @@
<?php $this->partial ('aside_flux'); ?>
<div class="post">
- <a href="<?php echo _url ('index', 'index'); ?>">← Retour à vos flux RSS</a>
+ <a href="<?php echo _url ('index', 'index'); ?>"><?php echo Translate::t ('back_to_rss_feeds'); ?></a>
<form method="post" action="<?php echo _url ('entry', 'note', 'id', $this->entry->id ()); ?>">
- <legend>Note</legend>
+ <legend><?php echo Translate::t ('note'); ?></legend>
<div class="form-group">
- <label class="group-name" for="note">Ajouter une note</label>
+ <label class="group-name" for="note"><?php echo Translate::t ('add_note'); ?></label>
<div class="group-controls">
<textarea rows="5" cols="80" name="note" id="note"><?php echo $this->entry->notes (); ?></textarea>
</div>
</div>
<div class="form-group">
- <label class="group-name" for="public_note">Article public ?</label>
+ <label class="group-name" for="public_note"><?php echo Translate::t ('ask_public_article'); ?></label>
<div class="group-controls">
<label class="checkbox" for="public">
- <input type="checkbox" name="public" id="public" value="yes"<?php echo $this->entry->isPublic () ? ' checked="checked"' : ''; ?> /> Oui
+ <input type="checkbox" name="public" id="public" value="yes"<?php echo $this->entry->isPublic () ? ' checked="checked"' : ''; ?> /> <?php echo Translate::t ('yes'); ?>
</label>
</div>
</div>
<div class="form-group form-actions">
<div class="group-controls">
- <button type="submit" class="btn btn-important">Sauvegarder</button>
- <button type="reset" class="btn">Annuler</button>
+ <button type="submit" class="btn btn-important"><?php echo Translate::t ('save'); ?></button>
+ <button type="reset" class="btn"><?php echo Translate::t ('cancel'); ?></button>
</div>
</div>
- <legend>Article</legend>
+ <legend><?php echo Translate::t ('article'); ?></legend>
<div class="form-group">
- <label class="group-name">Titre</label>
+ <label class="group-name"><?php echo Translate::t ('title'); ?></label>
<div class="group-controls">
<span class="control"><a href="<?php echo $this->entry->link (); ?>"><?php echo $this->entry->title (); ?></a></span>
</div>
@@ -41,7 +41,7 @@
$author = $this->entry->author ();
if ($author) { ?>
<div class="form-group">
- <label class="group-name">Auteur</label>
+ <label class="group-name"><?php echo Translate::t ('author'); ?></label>
<div class="group-controls">
<span class="control"><?php echo $author; ?></span>
</div>
@@ -49,14 +49,14 @@
<?php } ?>
<div class="form-group">
- <label class="group-name">Date de publication</label>
+ <label class="group-name"><?php echo Translate::t ('publication_date'); ?></label>
<div class="group-controls">
<span class="control"><?php echo $this->entry->date (); ?></span>
</div>
</div>
<div class="form-group">
- <label class="group-name">Article</label>
+ <label class="group-name"><?php echo Translate::t ('article'); ?></label>
<div class="group-controls">
<span class="control"><?php echo $this->entry->content (); ?></span>
</div>
diff --git a/app/views/error/index.phtml b/app/views/error/index.phtml
index 21d298eb4..d5d090c72 100644
--- a/app/views/error/index.phtml
+++ b/app/views/error/index.phtml
@@ -1,7 +1,10 @@
<div class="post">
- <div class="alert">
+ <div class="alert alert-error">
<h1 class="alert-head"><?php echo $this->code; ?></h1>
- <p><a href="<?php echo Url::display (); ?>">Revenir à l'accueil</a></p>
+ <p>
+ <?php echo Translate::t ('page_not_found'); ?><br />
+ <a href="<?php echo _url ('index', 'index'); ?>"><?php echo Translate::t ('back_to_rss_feeds'); ?></a>
+ </p>
</div>
</div>
diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml
index f91e3d95d..f029f281a 100755
--- a/app/views/helpers/pagination.phtml
+++ b/app/views/helpers/pagination.phtml
@@ -5,23 +5,12 @@
?>
<ul class="pagination">
- <li class="item pager-previous">
- <?php if ($this->currentPage > 1) { ?>
- <?php $params[$getteur] = $this->currentPage - 1; ?>
- <a href="<?php echo Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>">‹ plus récents</a>
- <?php } else { ?>
- &nbsp;
- <?php } ?>
- </li>
-
- <li class="item pager-current">page <?php echo $this->currentPage; ?> / <?php echo $this->nbPage; ?></li>
-
<li class="item pager-next">
- <?php if ($this->currentPage < $this->nbPage) { ?>
- <?php $params[$getteur] = $this->currentPage + 1; ?>
- <a href="<?php echo Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>">plus anciens ›</a>
+ <?php if ($this->next != '') { ?>
+ <?php $params[$getteur] = $this->next; ?>
+ <a href="<?php echo Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo Translate::t ('load_more'); ?></a>
<?php } else { ?>
- &nbsp;
+ <?php echo Translate::t ('nothing_to_load'); ?>
<?php } ?>
</li>
</ul>
diff --git a/app/views/helpers/rss.phtml b/app/views/helpers/rss.phtml
index 1aa0ac44a..83de6de2e 100755
--- a/app/views/helpers/rss.phtml
+++ b/app/views/helpers/rss.phtml
@@ -3,7 +3,7 @@
<channel>
<title><?php echo View::title(); ?></title>
<link><?php echo Url::display(); ?></link>
- <description>Flux RSS de <?php echo View::title(); ?></description>
+ <description><?php echo Translate::t ('rss_feeds_of', View::title()); ?></description>
<pubDate><?php echo date('D, d M Y H:i:s O'); ?></pubDate>
<lastBuildDate><?php echo gmdate('D, d M Y H:i:s'); ?> GMT</lastBuildDate>
<atom:link href="<?php echo _url ('index', 'index', 'output', 'rss'); ?>" rel="self" type="application/rss+xml" />
diff --git a/app/views/index/about.phtml b/app/views/index/about.phtml
index 73f5f4001..7c228b581 100644
--- a/app/views/index/about.phtml
+++ b/app/views/index/about.phtml
@@ -1,24 +1,24 @@
<div class="post content">
- <a href="<?php echo _url ('index', 'index'); ?>">← Retour à vos flux RSS</a>
+ <a href="<?php echo _url ('index', 'index'); ?>"><?php echo Translate::t ('back_to_rss_feeds'); ?></a>
- <h1>À propos de FreshRSS</h1>
+ <h1><?php echo Translate::t ('about_freshrss'); ?></h1>
<dl class="infos">
- <dt>Url du projet</dt>
+ <dt><?php echo Translate::t ('project_website'); ?></dt>
<dd><a href="https://github.com/marienfressinaud/FreshRSS">https://github.com/marienfressinaud/FreshRSS</a></dd>
- <dt>Développeur principal</dt>
- <dd><a href="mailto:contact@marienfressinaud.fr">Marien Fressinaud</a> - <a href="http://marienfressinaud.fr">site Internet</a></dd>
+ <dt><?php echo Translate::t ('lead_developer'); ?></dt>
+ <dd><a href="mailto:contact@marienfressinaud.fr">Marien Fressinaud</a> - <a href="http://marienfressinaud.fr"><?php echo Translate::t ('website'); ?></a></dd>
- <dt>Pour les rapports de bugs</dt>
- <dd><a href="https://github.com/marienfressinaud/FreshRSS/issues">sur Github</a> ou <a href="mailto:dev@marienfressinaud.fr">par mail</a></dd>
+ <dt><?php echo Translate::t ('bugs_reports'); ?></dt>
+ <dd><?php echo Translate::t ('github_or_email'); ?></dd>
- <dt>Licence</dt>
- <dd><a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a></dd>
+ <dt><?php echo Translate::t ('license'); ?></dt>
+ <dd><?php echo Translate::t ('agpl3'); ?></dd>
</dl>
- <p>FreshRSS est un agrégateur de flux RSS à auto-héberger à l'image de <a href="http://rsslounge.aditu.de/">RSSLounge</a>, <a href="http://tt-rss.org/redmine/projects/tt-rss/wiki">TinyTinyRSS</a> ou <a href="http://projet.idleman.fr/leed/">Leed</a>. Il se veut léger et facile à prendre en main tout en étant un outil puissant et paramétrable. L'objectif étant d'offrir une alternative sérieuse au futur feu-Google Reader.</p>
+ <p><?php echo Translate::t ('freshrss_description'); ?></p>
- <h1>Crédits</h1>
- Des éléments de design sont issus du <a href="http://twitter.github.io/bootstrap/">projet Bootstrap</a> bien que FreshRSS n'utilise pas ce framework. Les <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">icônes</a> sont issues du <a href="https://www.gnome.org/">projet GNOME</a>. La police <em>Open Sans</em> utilisée a été créée par <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a>. Les favicons sont récupérés grâce au site <a href="https://getfavicon.appspot.com/">getFavicon</a>. FreshRSS repose sur <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, un framework PHP.
+ <h1><?php echo Translate::t ('credits'); ?></h1>
+ <p><?php echo Translate::t ('credits_content'); ?></p>
</div>
diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml
index 6889a8b51..0e09f84df 100644
--- a/app/views/index/index.phtml
+++ b/app/views/index/index.phtml
@@ -1,18 +1,16 @@
<?php
-if (Request::param ('output', '') == 'rss') {
- $this->renderHelper ('rss');
- return;
-}
-?>
-
-<?php $this->partial ('aside_flux'); ?>
+$output = Request::param ('output', 'normal');
-<?php $this->partial ('nav_menu'); ?>
+if ($output == 'rss') {
+ $this->renderHelper ('rss');
+} else {
+ $this->partial ('aside_flux');
+ $this->partial ('nav_menu');
-<?php
-if (isset ($this->entryPaginator)) {
- $items = $this->entryPaginator->items (true);
+ if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) {
+ $items = $this->entryPaginator->items ();
?>
+
<div id="stream">
<?php
$display_today = true;
@@ -22,13 +20,13 @@ if (isset ($this->entryPaginator)) {
<?php foreach ($items as $item) { ?>
<?php if ($display_today && $item->isDay (Days::TODAY)) { ?>
- <div class="day">Aujourd'hui - <?php echo timestamptodate (time (), false); ?></div>
+ <div class="day"><?php echo Translate::t ('today'); ?> - <?php echo timestamptodate (time (), false); ?></div>
<?php $display_today = false; } ?>
<?php if ($display_yesterday && $item->isDay (Days::YESTERDAY)) { ?>
- <div class="day">Hier - <?php echo timestamptodate (time () - 86400, false); ?></div>
+ <div class="day"><?php echo Translate::t ('yesterday'); ?> - <?php echo timestamptodate (time () - 86400, false); ?></div>
<?php $display_yesterday = false; } ?>
<?php if ($display_others && $item->isDay (Days::BEFORE_YESTERDAY)) { ?>
- <div class="day">À partir d'avant-hier</div>
+ <div class="day"><?php echo Translate::t ('before_yesterday'); ?></div>
<?php $display_others = false; } ?>
<div class="flux<?php echo !$item->isRead () ? ' not_read' : ''; ?><?php echo $item->isFavorite () ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id (); ?>">
@@ -49,9 +47,9 @@ if (isset ($this->entryPaginator)) {
</li>
<?php } ?>
<?php $feed = $item->feed (true); ?>
- <li class="item website"><a href="<?php echo _url ('index', 'index', 'get', 'f_' . $feed->id ()); ?>"><img class="favicon" src="http://g.etfv.co/<?php echo $feed->website (); ?>" alt="" /> <span><?php echo $feed->name (); ?></span></a></li>
+ <li class="item website"><a href="<?php echo _url ('index', 'index', 'get', 'f_' . $feed->id ()); ?>"><img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="" /> <span><?php echo $feed->name (); ?></span></a></li>
<li class="item title"><?php echo $item->title (); ?></li>
- <li class="item date">le <?php echo $item->date (); ?></li>
+ <li class="item date"><?php echo $item->date (); ?></li>
<li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>">&nbsp;</a></li>
</ul>
@@ -59,48 +57,64 @@ if (isset ($this->entryPaginator)) {
<div class="content">
<h1 class="title"><?php echo $item->title (); ?></h1>
<?php $author = $item->author (); ?>
- <?php echo $author != '' ? '<div class="author">Par <em>' . $author . '</em></div>' : ''; ?>
+ <?php echo $author != '' ? '<div class="author">' . Translate::t ('by_author', $author) . '</div>' : ''; ?>
<?php echo $item->content (); ?>
</div>
<ul class="horizontal-list bottom">
<li class="item">
<?php if ($item->notes () != '') { ?>
- <i class="icon i_note"></i> <a class="note" href="<?php echo _url ('entry', 'note', 'id', $item->id ()); ?>">Modifier votre note</a>
+ <i class="icon i_note"></i> <a class="note" href="<?php echo _url ('entry', 'note', 'id', $item->id ()); ?>"><?php echo Translate::t ('update_note'); ?></a>
<?php } else { ?>
- <i class="icon i_note_empty"></i> <a class="note" href="<?php echo _url ('entry', 'note', 'id', $item->id ()); ?>">Ajouter une note</a>
+ <i class="icon i_note_empty"></i> <a class="note" href="<?php echo _url ('entry', 'note', 'id', $item->id ()); ?>"><?php echo Translate::t ('add_note'); ?></a>
<?php } ?>
</li>
<li class="item">
<div class="dropdown">
<div id="dropdown-share-<?php echo $item->id ();?>" class="dropdown-target"></div>
- <i class="icon i_share"></i> <a class="dropdown-toggle" href="#dropdown-share-<?php echo $item->id ();?>">Partager</a>
+ <i class="icon i_share"></i> <a class="dropdown-toggle" href="#dropdown-share-<?php echo $item->id ();?>"><?php echo Translate::t ('share'); ?></a>
<ul class="dropdown-menu">
<li class="dropdown-close"><a href="#close"><i class="icon i_close"></i></a></li>
- <li class="item"><a href="mailto:?subject=<?php echo $item->title (); ?>&amp;body=J'ai trouvé cet article intéressant, tu peux le lire à cette adresse : <?php echo urlencode($item->link ()); ?>">Par mail</a></li>
+ <li class="item"><a href="mailto:?subject=<?php echo $item->title (); ?>&amp;body=J'ai trouvé cet article intéressant, tu peux le lire à cette adresse : <?php echo urlencode($item->link ()); ?>"><?php echo Translate::t ('by_email'); ?></a></li>
<?php
$shaarli = $this->conf->urlShaarli ();
if ($shaarli) {
?>
- <li class="item"><a target="_blank" href="<?php echo $shaarli . '?post=' . urlencode($item->link ()) . '&amp;title=' . urlencode ($item->title ()) . '&amp;source=bookmarklet'; ?>">Shaarli</a></li>
+ <li class="item"><a target="_blank" href="<?php echo $shaarli . '?post=' . urlencode($item->link ()) . '&amp;title=' . urlencode ($item->title ()) . '&amp;source=bookmarklet'; ?>"><?php echo Translate::t ('on_shaarli'); ?></a></li>
<?php } ?>
</ul>
</div>
</li>
+ <?php $tags = $item->tags(); ?>
+ <?php if(!empty($tags)) { ?>
+ <li class="item">
+ <div class="dropdown">
+ <div id="dropdown-tags-<?php echo $item->id ();?>" class="dropdown-target"></div>
+ <i class="icon i_tag"></i> <a class="dropdown-toggle" href="#dropdown-tags-<?php echo $item->id ();?>"><?php echo Translate::t ('related_tags'); ?></a>
+
+ <ul class="dropdown-menu">
+ <li class="dropdown-close"><a href="#close"><i class="icon i_close"></i></a></li>
+
+ <?php foreach($tags as $tag) { ?>
+ <li class="item"><span><?php echo $tag; ?></span></li>
+ <?php } ?>
+ </ul>
+ </div>
+ </li>
+ <?php } ?>
</ul>
</div>
</div>
<?php } ?>
- <?php $this->entryPaginator->render ('pagination.phtml', 'page'); ?>
+ <?php $this->entryPaginator->render ('pagination.phtml', 'next'); ?>
</div>
-<?php } else { ?>
-<div class="alert">
- <span class="alert-head">Il n'y a aucun flux à afficher.</span>
- <?php if (Session::param ('mode', 'all') == 'not_read') { ?>
- <a class="print_all" href="<?php echo _url ('index', 'changeMode', 'mode', 'all'); ?>">Afficher tous les articles ?</a>
- <?php } ?>
+
+ <?php } else { ?>
+<div class="alert alert-warn">
+ <span class="alert-head"><?php echo Translate::t ('no_feed_to_display'); ?></span>
</div>
+ <?php } ?>
<?php } ?>
diff --git a/app/views/javascript/actualize.phtml b/app/views/javascript/actualize.phtml
index 16188422a..fa6e67ddb 100644
--- a/app/views/javascript/actualize.phtml
+++ b/app/views/javascript/actualize.phtml
@@ -6,7 +6,7 @@ feeds.push ("<?php echo Url::display (array ('c' => 'feed', 'a' => 'actualize',
function initProgressBar (init) {
if (init) {
$("body").after ("\<div id=\"actualizeProgress\" class=\"actualizeProgress\">\
- Actualisation <span class=\"progress\">0 / " + feeds.length + "</span><br />\
+ <?php echo Translate::t ('refresh'); ?> <span class=\"progress\">0 / " + feeds.length + "</span><br />\
<progress id=\"actualizeProgressBar\" value=\"0\" max=\"" + feeds.length + "\"></progress>\
</div>");
} else {
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-10 12:06:50 +0000