From c515ffec9c4e43c6e826645168a36cedaf0b6870 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Fri, 7 Feb 2014 17:49:27 +0200 Subject: Polish and Ukrainian translations added. Russian - updated. Plust 2 small translation related fixes in code. --- inc/poche/Poche.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'inc/poche') diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 4df90067..74827253 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -565,7 +565,8 @@ class Poche if (count($entries) > 0) { $this->pagination->set_total(count($entries)); - $page_links = $this->pagination->page_links('?view=' . $view . '&sort=' . $_SESSION['sort'] . '&'); + $page_links = str_replace(array('previous', 'next'), array(_('previous'), _('next')), + $this->pagination->page_links('?view=' . $view . '&sort=' . $_SESSION['sort'] . '&')); $datas = $this->store->getEntriesByView($view, $this->user->getId(), $this->pagination->get_limit()); $tpl_vars['entries'] = $datas; $tpl_vars['page_links'] = $page_links; -- cgit v1.2.3 From 044bf638a89a4b5718340500d844e5b7eb4a5df2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 12 Feb 2014 19:58:49 +0100 Subject: bug fix #364 - RSS Feed URL problem with + sign --- inc/poche/Poche.class.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'inc/poche') diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 77361ef7..7e3cac82 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -228,10 +228,6 @@ class Poche # filter for reading time $filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime'); $this->tpl->addFilter($filter); - - # filter for simple filenames in config view - $filter = new Twig_SimpleFilter('getPrettyFilename', function($string) { return str_replace(ROOT, '', $string); }); - $this->tpl->addFilter($filter); } private function install() @@ -480,8 +476,8 @@ class Poche switch ($view) { case 'config': - $dev = $this->getPocheVersion('dev'); - $prod = $this->getPocheVersion('prod'); + $dev = trim($this->getPocheVersion('dev')); + $prod = trim($this->getPocheVersion('prod')); $compare_dev = version_compare(POCHE, $dev); $compare_prod = version_compare(POCHE, $prod); $themes = $this->getInstalledThemes(); @@ -745,7 +741,6 @@ class Poche { $this->user = array(); Session::logout(); - $this->messages->add('s', _('see you soon!')); Tools::logm('logout'); Tools::redirect(); } @@ -1009,6 +1004,7 @@ class Poche $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20); } + $token = str_replace('+', '', $token); $this->store->updateUserConfig($this->user->getId(), 'token', $token); $currentConfig = $_SESSION['poche_user']->config; $currentConfig['token'] = $token; -- cgit v1.2.3 From 26929c08d3788764042065789c3ed36af41bd208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 12 Feb 2014 20:04:47 +0100 Subject: bug fix #430 - welcome to your wallabag --- inc/poche/Poche.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/poche') diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 7e3cac82..78031984 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -722,7 +722,7 @@ class Poche $longlastingsession = isset($_POST['longlastingsession']); $passwordTest = ($isauthenticated) ? $user['password'] : Tools::encodeString($password . $login); Session::login($user['username'], $user['password'], $login, $passwordTest, $longlastingsession, array('poche_user' => new User($user))); - $this->messages->add('s', _('welcome to your poche')); + $this->messages->add('s', _('welcome to your wallabag')); Tools::logm('login successful'); Tools::redirect($referer); } -- cgit v1.2.3 From f14807de06929486de6e2b64cd30e5c53978d8c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 12 Feb 2014 21:52:01 +0100 Subject: [add] mark all as read #385 --- inc/poche/Database.class.php | 6 ++++++ inc/poche/Poche.class.php | 7 +++++++ 2 files changed, 13 insertions(+) (limited to 'inc/poche') diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php index 0457af69..9f553fa1 100644 --- a/inc/poche/Database.class.php +++ b/inc/poche/Database.class.php @@ -318,6 +318,12 @@ class Database { $query = $this->executeQuery($sql_action, $params_action); } + public function archiveAll($user_id) { + $sql_action = "UPDATE entries SET is_read=? WHERE user_id=? AND is_read=?"; + $params_action = array($user_id, 1, 0); + $query = $this->executeQuery($sql_action, $params_action); + } + public function getLastId($column = '') { return $this->getHandle()->lastInsertId($column); } diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 9345d1c1..a786c8df 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -434,6 +434,13 @@ class Poche Tools::redirect(); } break; + case 'archive_all' : + $this->store->archiveAll($this->user->getId()); + Tools::logm('archive all links'); + if (!$import) { + Tools::redirect(); + } + break; case 'add_tag' : $tags = explode(',', $_POST['value']); $entry_id = $_POST['entry_id']; -- cgit v1.2.3 From 3141347214bc37e9430198f3872f914c795d969d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 12 Feb 2014 21:59:02 +0100 Subject: new default theme, baggy \o/ --- inc/poche/config.inc.php.new | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/poche') diff --git a/inc/poche/config.inc.php.new b/inc/poche/config.inc.php.new index 39cb2f2f..8d52497b 100755 --- a/inc/poche/config.inc.php.new +++ b/inc/poche/config.inc.php.new @@ -44,7 +44,7 @@ define ('FLATTRABLE', '1'); define ('FLATTRED', '2'); define ('ABS_PATH', 'assets/'); -define ('DEFAULT_THEME', 'default'); +define ('DEFAULT_THEME', 'baggy'); define ('THEME', ROOT . '/themes'); define ('LOCALE', ROOT . '/locale'); -- cgit v1.2.3 From 2e4440c3f8b95a7797cd19c1c27eaef83da48b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 13 Feb 2014 08:57:44 +0100 Subject: [change] wallabag in feeds title --- inc/poche/Poche.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'inc/poche') diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index a786c8df..dd5fb0b9 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -1031,10 +1031,10 @@ class Poche // Check the token $feed = new FeedWriter(RSS2); - $feed->setTitle('poche - ' . $type . ' feed'); + $feed->setTitle('wallabag — ' . $type . ' feed'); $feed->setLink(Tools::getPocheUrl()); $feed->setChannelElement('updated', date(DATE_RSS , time())); - $feed->setChannelElement('author', 'poche'); + $feed->setChannelElement('author', 'wallabag'); if ($type == 'tag') { $entries = $this->store->retrieveEntriesByTag($tag_id); -- cgit v1.2.3 From 41265e07d4cbad9588586324a4fb080b12ef3a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 13 Feb 2014 18:57:57 +0100 Subject: add help about vendor.zip --- inc/poche/Poche.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/poche') diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index dd5fb0b9..5eba3564 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -101,7 +101,7 @@ class Poche $passTheme = TRUE; # Twig is an absolute requirement for Poche to function. Abort immediately if the Composer installer hasn't been run yet if (! self::$canRenderTemplates) { - $this->notInstalledMessage[] = 'Twig does not seem to be installed. Please initialize the Composer installation to automatically fetch dependencies. Have a look at the documentation.'; + $this->notInstalledMessage[] = 'Twig does not seem to be installed. Please initialize the Composer installation to automatically fetch dependencies. You can also download vendor.zip and extract it in your wallabag folder.'; $passTheme = FALSE; } -- cgit v1.2.3