code formatting changes: tabs replaced with spaces, some other small formatting enhancements
This commit is contained in:
Maryana Rozhankivska
commit
a8ef1f3f43
|
|
@ -101,8 +101,7 @@
|
|||
*/
|
||||
public function setDescription($description)
|
||||
{
|
||||
$tag = 'description';
|
||||
$this->setElement($tag, $description);
|
||||
$this->setElement('description', $description);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -166,6 +165,18 @@
|
|||
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the 'source' element of feed item
|
||||
*
|
||||
* @access public
|
||||
* @param string The content of 'source' element
|
||||
* @return void
|
||||
*/
|
||||
public function setSource($link)
|
||||
{
|
||||
$this->setElement('source', $link);
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the 'encloser' element of feed item
|
||||
* For RSS 2.0 only
|
||||
|
|
|
|||
|
|
@ -191,10 +191,9 @@ define('JSONP', 3, true);
|
|||
* @param srting value of 'description' channel tag
|
||||
* @return void
|
||||
*/
|
||||
public function setDescription($desciption)
|
||||
public function setDescription($description)
|
||||
{
|
||||
$tag = ($this->version == ATOM)? 'subtitle' : 'description';
|
||||
$this->setChannelElement($tag, $desciption);
|
||||
$this->setChannelElement('description', $description);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -943,8 +943,7 @@ class Poche
|
|||
* export poche entries in json
|
||||
* @return json all poche entries
|
||||
*/
|
||||
public function export()
|
||||
{
|
||||
public function export() {
|
||||
$filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json";
|
||||
header('Content-Disposition: attachment; filename='.$filename);
|
||||
|
||||
|
|
@ -960,8 +959,7 @@ class Poche
|
|||
* @param string $which 'prod' or 'dev'
|
||||
* @return string latest $which version
|
||||
*/
|
||||
private function getPocheVersion($which = 'prod')
|
||||
{
|
||||
private function getPocheVersion($which = 'prod') {
|
||||
$cache_file = CACHE . '/' . $which;
|
||||
$check_time = time();
|
||||
|
||||
|
|
@ -1032,6 +1030,7 @@ class Poche
|
|||
foreach ($entries as $entry) {
|
||||
$newItem = $feed->createNewItem();
|
||||
$newItem->setTitle($entry['title']);
|
||||
$newItem->setSource(Tools::getPocheUrl() . '?view=view&id=' . $entry['id']);
|
||||
$newItem->setLink($entry['url']);
|
||||
$newItem->setDate(time());
|
||||
$newItem->setDescription($entry['content']);
|
||||
|
|
|
|||
|
|
@ -59,8 +59,10 @@ class Tools
|
|||
return $scriptname;
|
||||
}
|
||||
|
||||
$host = (isset($_SERVER['HTTP_X_FORWARDED_HOST']) ? $_SERVER['HTTP_X_FORWARDED_HOST'] : (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME']));
|
||||
|
||||
return 'http' . ($https ? 's' : '') . '://'
|
||||
. $_SERVER["HTTP_HOST"] . $serverport . $scriptname;
|
||||
. $host . $serverport . $scriptname;
|
||||
}
|
||||
|
||||
public static function redirect($url = '')
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,26 +1,25 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: \n"
|
||||
"Project-Id-Version: wallabag 1.6.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2014-02-25 18:33+0300\n"
|
||||
"PO-Revision-Date: \n"
|
||||
"Last-Translator: Maryana <mariroz@mr.lviv.ua>\n"
|
||||
"Last-Translator: Gilles WITTEZAELE <gilles.wittezaele@laposte.net>\n"
|
||||
"Language-Team: \n"
|
||||
"Language: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
|
||||
"X-Poedit-Basepath: .\n"
|
||||
"X-Poedit-SourceCharset: utf-8\n"
|
||||
"X-Generator: Poedit 1.5.7\n"
|
||||
"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n"
|
||||
"X-Poedit-SourceCharset: UTF-8\n"
|
||||
"X-Generator: Poedit 1.6.4\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
|
||||
"Language: fr_FR\n"
|
||||
|
||||
msgid "wallabag, a read it later open source system"
|
||||
msgstr "wallabag, un système open source de lecture différé"
|
||||
|
||||
msgid "login failed: user doesn't exist"
|
||||
msgstr "identification échouée : l'utilisateur n'existe pas"
|
||||
msgstr "échec de l'identification : cet utilisateur n'existe pas"
|
||||
|
||||
msgid "return home"
|
||||
msgstr "retour à l'accueil"
|
||||
|
|
@ -32,13 +31,13 @@ msgid "Saving articles"
|
|||
msgstr "Sauvegarde des articles"
|
||||
|
||||
msgid "There are several ways to save an article:"
|
||||
msgstr "Il y a plusieurs façons de sauver un article :"
|
||||
msgstr "Il y a plusieurs façons d'enregistrer un article :"
|
||||
|
||||
msgid "read the documentation"
|
||||
msgstr "lisez la documentation"
|
||||
|
||||
msgid "download the extension"
|
||||
msgstr "télécharger l'extension"
|
||||
msgstr "téléchargez l'extension"
|
||||
|
||||
msgid "via F-Droid"
|
||||
msgstr "via F-Droid"
|
||||
|
|
@ -50,7 +49,7 @@ msgid "via Google Play"
|
|||
msgstr "via Google PlayStore"
|
||||
|
||||
msgid "download the application"
|
||||
msgstr "télécharger l'application"
|
||||
msgstr "téléchargez l'application"
|
||||
|
||||
msgid "By filling this field"
|
||||
msgstr "En remplissant ce champ"
|
||||
|
|
@ -85,8 +84,13 @@ msgstr "Une version de développement plus récente est disponible."
|
|||
msgid "Feeds"
|
||||
msgstr "Flux"
|
||||
|
||||
msgid "Your feed token is currently empty and must first be generated to enable feeds. Click <a href='?feed&action=generate'>here to generate it</a>."
|
||||
msgstr "Votre jeton de flux est actuellement vide doit d'abord être généré pour activer les flux. Cliquez <a href='?feed&action=generate'>ici</a> pour le générer."
|
||||
msgid ""
|
||||
"Your feed token is currently empty and must first be generated to enable "
|
||||
"feeds. Click <a href='?feed&action=generate'>here to generate it</a>."
|
||||
msgstr ""
|
||||
"Votre jeton de flux est actuellement vide et doit d'abord être généré pour "
|
||||
"activer les flux. Cliquez <a href='?feed&action=generate'>ici</a> pour "
|
||||
"le générer."
|
||||
|
||||
msgid "Unread feed"
|
||||
msgstr "Flux des non lus"
|
||||
|
|
@ -103,8 +107,12 @@ msgstr "Votre jeton :"
|
|||
msgid "Your user id:"
|
||||
msgstr "Votre ID utilisateur :"
|
||||
|
||||
msgid "You can regenerate your token: <a href='?feed&action=generate'>generate!</a>."
|
||||
msgstr "Vous pouvez regénérer votre jeton : <a href='?feed&action=generate'>génération !</a>."
|
||||
msgid ""
|
||||
"You can regenerate your token: <a href='?feed&action=generate'>generate!"
|
||||
"</a>."
|
||||
msgstr ""
|
||||
"Vous pouvez regénérer votre jeton : <a href='?feed&"
|
||||
"action=generate'>génération !</a>."
|
||||
|
||||
msgid "Change your theme"
|
||||
msgstr "Changer votre thème"
|
||||
|
|
@ -136,8 +144,11 @@ msgstr "Répétez votre nouveau mot de passe :"
|
|||
msgid "Import"
|
||||
msgstr "Importer"
|
||||
|
||||
msgid "Please execute the import script locally as it can take a very long time."
|
||||
msgstr "Merci d'exécuter l'import en local car cela peut prendre du temps."
|
||||
msgid ""
|
||||
"Please execute the import script locally as it can take a very long time."
|
||||
msgstr ""
|
||||
"Merci d'exécuter le script d'importation en local car cela peut prendre du "
|
||||
"temps."
|
||||
|
||||
msgid "More info in the official documentation:"
|
||||
msgstr "Plus d'infos dans la documentation officielle :"
|
||||
|
|
@ -150,13 +161,13 @@ msgid "(you must have a %s file on your server)"
|
|||
msgstr "(le fichier %s doit être présent sur le serveur)"
|
||||
|
||||
msgid "Import from Readability"
|
||||
msgstr "Import depuis Readability"
|
||||
msgstr "Importer depuis Readability"
|
||||
|
||||
msgid "Import from Instapaper"
|
||||
msgstr "Import depuis Instapaper"
|
||||
msgstr "Importer depuis Instapaper"
|
||||
|
||||
msgid "Import from wallabag"
|
||||
msgstr "Import depuis wallabag"
|
||||
msgstr "Importer depuis wallabag"
|
||||
|
||||
msgid "Export your wallabag data"
|
||||
msgstr "Exporter vos données de wallabag"
|
||||
|
|
@ -185,8 +196,12 @@ msgstr "retourner à l'article"
|
|||
msgid "plop"
|
||||
msgstr "plop"
|
||||
|
||||
msgid "You can <a href='wallabag_compatibility_test.php'>check your configuration here</a>."
|
||||
msgstr "Vous pouvez vérifier votre configuration <a href='wallabag_compatibility_test.php'>ici</a>."
|
||||
msgid ""
|
||||
"You can <a href='wallabag_compatibility_test.php'>check your configuration "
|
||||
"here</a>."
|
||||
msgstr ""
|
||||
"Vous pouvez vérifier votre configuration <a "
|
||||
"href='wallabag_compatibility_test.php'>ici</a>."
|
||||
|
||||
msgid "favoris"
|
||||
msgstr "favoris"
|
||||
|
|
@ -248,8 +263,14 @@ msgstr "installation"
|
|||
msgid "install your wallabag"
|
||||
msgstr "installez votre wallabag"
|
||||
|
||||
msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to <a href='http://doc.wallabag.org/'>read the documentation on wallabag website</a>."
|
||||
msgstr "wallabag n'est pas encore installé. Merci de remplir le formulaire suivant pour l'installer. N'hésitez pas à <a href='http://doc.wallabag.org'>lire la documentation sur le site de wallabag</a>."
|
||||
msgid ""
|
||||
"wallabag is still not installed. Please fill the below form to install it. "
|
||||
"Don't hesitate to <a href='http://doc.wallabag.org/'>read the documentation "
|
||||
"on wallabag website</a>."
|
||||
msgstr ""
|
||||
"wallabag n'est pas encore installé. Merci de remplir le formulaire suivant "
|
||||
"pour l'installer. N'hésitez pas à <a href='http://doc.wallabag.org'>lire la "
|
||||
"documentation sur le site de wallabag</a>."
|
||||
|
||||
msgid "Login"
|
||||
msgstr "Nom d'utilisateur"
|
||||
|
|
@ -267,7 +288,8 @@ msgid "Login to wallabag"
|
|||
msgstr "Se connecter à wallabag"
|
||||
|
||||
msgid "you are in demo mode, some features may be disabled."
|
||||
msgstr "vous êtes en mode démo, certaines fonctionnalités peuvent être désactivées."
|
||||
msgstr ""
|
||||
"vous êtes en mode démo, certaines fonctionnalités peuvent être désactivées."
|
||||
|
||||
msgid "Username"
|
||||
msgstr "Nom d'utilisateur"
|
||||
|
|
@ -318,10 +340,10 @@ msgid "tags:"
|
|||
msgstr "tags :"
|
||||
|
||||
msgid "Edit tags"
|
||||
msgstr "Editer les tags"
|
||||
msgstr "Modifier les tags"
|
||||
|
||||
msgid "save link!"
|
||||
msgstr "sauver le lien !"
|
||||
msgstr "enregistrer le lien !"
|
||||
|
||||
msgid "powered by"
|
||||
msgstr "propulsé par"
|
||||
|
|
@ -360,7 +382,7 @@ msgid "tweet"
|
|||
msgstr "tweet"
|
||||
|
||||
msgid "email"
|
||||
msgstr "ee-mail"
|
||||
msgstr "e-mail"
|
||||
|
||||
msgid "this article appears wrong?"
|
||||
msgstr "cet article s'affiche mal ?"
|
||||
|
|
@ -369,7 +391,7 @@ msgid "No link available here!"
|
|||
msgstr "Aucun lien n'est disponible ici !"
|
||||
|
||||
msgid "Poching a link"
|
||||
msgstr "Sauver un lien"
|
||||
msgstr "Enregistrer un lien"
|
||||
|
||||
msgid "by filling this field"
|
||||
msgstr "en remplissant ce champ"
|
||||
|
|
@ -396,19 +418,21 @@ msgid "a more recent development version is available."
|
|||
msgstr "une version de développement plus récente est disponible."
|
||||
|
||||
msgid "Please execute the import script locally, it can take a very long time."
|
||||
msgstr "Merci d'exécuter l'import en local car cela peut prendre du temps."
|
||||
msgstr ""
|
||||
"Merci d'exécuter le script d'importation en local car cela peut prendre du "
|
||||
"temps."
|
||||
|
||||
msgid "More infos in the official doc:"
|
||||
msgstr "Plus d'infos dans la documentation officielle :"
|
||||
|
||||
msgid "import from Pocket"
|
||||
msgstr "import depuis Pocket"
|
||||
msgstr "importation depuis Pocket"
|
||||
|
||||
msgid "import from Readability"
|
||||
msgstr "import depuis Readability"
|
||||
msgstr "importation depuis Readability"
|
||||
|
||||
msgid "import from Instapaper"
|
||||
msgstr "import depuis Instapaper"
|
||||
msgstr "importation depuis Instapaper"
|
||||
|
||||
msgid "estimated reading time :"
|
||||
msgstr "temps de lecture estimé :"
|
||||
|
|
@ -449,8 +473,12 @@ msgstr "en mode démo, vous ne pouvez pas mettre à jour le mot de passe"
|
|||
msgid "your password has been updated"
|
||||
msgstr "votre mot de passe a été mis à jour"
|
||||
|
||||
msgid "the two fields have to be filled & the password must be the same in the two fields"
|
||||
msgstr "les deux champs doivent être remplis & le mot de passe doit être le même dans les deux"
|
||||
msgid ""
|
||||
"the two fields have to be filled & the password must be the same in the two "
|
||||
"fields"
|
||||
msgstr ""
|
||||
"les deux champs doivent être remplis & le mot de passe doit être le même "
|
||||
"dans les deux"
|
||||
|
||||
msgid "still using the \""
|
||||
msgstr "utilise encore \""
|
||||
|
|
@ -459,7 +487,7 @@ msgid "that theme does not seem to be installed"
|
|||
msgstr "ce thème ne semble pas installé"
|
||||
|
||||
msgid "you have changed your theme preferences"
|
||||
msgstr "vous avez changez vos préférences de thème"
|
||||
msgstr "vous avez changé vos préférences de thème"
|
||||
|
||||
msgid "that language does not seem to be installed"
|
||||
msgstr "cette langue ne semble pas être installée"
|
||||
|
|
@ -468,28 +496,28 @@ msgid "you have changed your language preferences"
|
|||
msgstr "vous avez changé vos préférences de langue"
|
||||
|
||||
msgid "login failed: you have to fill all fields"
|
||||
msgstr "identification échouée : vous devez remplir tous les champs"
|
||||
msgstr "échec de l'identification : vous devez remplir tous les champs"
|
||||
|
||||
msgid "welcome to your wallabag"
|
||||
msgstr "bienvenue dans votre wallabag"
|
||||
|
||||
msgid "login failed: bad login or password"
|
||||
msgstr "identification échouée : mauvais identifiant ou mot de passe"
|
||||
msgstr "échec de l'identification : mauvais identifiant ou mot de passe"
|
||||
|
||||
msgid "import from instapaper completed"
|
||||
msgstr "Import depuis Instapaper complété"
|
||||
msgstr "Importation depuis Instapaper complété"
|
||||
|
||||
msgid "import from pocket completed"
|
||||
msgstr "Import depuis Pocket complété"
|
||||
msgstr "Importation depuis Pocket complété"
|
||||
|
||||
msgid "import from Readability completed. "
|
||||
msgstr "Import depuis Readability complété"
|
||||
msgstr "Importation depuis Readability complété"
|
||||
|
||||
msgid "import from Poche completed. "
|
||||
msgstr "Import depuis Pocket complété"
|
||||
msgstr "Importation depuis Pocket complété"
|
||||
|
||||
msgid "Unknown import provider."
|
||||
msgstr "Fournisseur d'import inconnu."
|
||||
msgstr "Format d'importation inconnu."
|
||||
|
||||
msgid "Incomplete inc/poche/define.inc.php file, please define \""
|
||||
msgstr "Fichier inc/poche/define.inc.php incomplet, merci de définir \""
|
||||
|
|
@ -498,7 +526,7 @@ msgid "Could not find required \""
|
|||
msgstr "Ne peut pas trouver \""
|
||||
|
||||
msgid "Uh, there is a problem while generating feeds."
|
||||
msgstr "Ih, il y a un problème lors de la génération des flux."
|
||||
msgstr "Hum, il y a un problème lors de la génération des flux."
|
||||
|
||||
msgid "Cache deleted."
|
||||
msgstr "Cache effacé."
|
||||
|
|
|
|||
Loading…
Reference in New Issue