From 16a131380bb1ae17a18e4bf95d345cffb80a787c Mon Sep 17 00:00:00 2001 From: Patrick Crandol Date: Sun, 18 Nov 2018 05:37:22 -0500 Subject: I18n standardization (#2138) * i18n Admin standardization cz - moved items incorrectly placed in system array to extensions array nl - remove registration array in user array that doesn't appear in any other translations - possibly from an old version that didn't get removed? oc - reordered list to standardize order with other translation files. * Alphabetize extensions Array * Standardize conf.php he - removed options not appearing in other i18n files, added missing strings * Standardize feedback.php he - removed line not found in other translation files nl - removed line not found in other translation files * Standardize gen.php * Standardize index.php Major sorting of oc. Added tags to several languages * Standardize install.php ru - added missing strings it - remove extra string not found in other config files he - add missing strings, remove strings not found in other languages oc - reorganize * Standardize sub.php * Standardize and fix TODOs use format "//TODO - Translation" for easier searching * Fix whitespace --- app/i18n/pt-br/sub.php | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'app/i18n/pt-br/sub.php') diff --git a/app/i18n/pt-br/sub.php b/app/i18n/pt-br/sub.php index daa24e8f3..15986d6c3 100644 --- a/app/i18n/pt-br/sub.php +++ b/app/i18n/pt-br/sub.php @@ -2,13 +2,13 @@ return array( 'api' => array( - 'documentation' => 'Copy the following URL to use it within an external tool.',// TODO - 'title' => 'API',// TODO + 'documentation' => 'Copy the following URL to use it within an external tool.', //TODO - Translation + 'title' => 'API', //TODO - Translation ), 'bookmarklet' => array( - 'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',// TODO - 'label' => 'Subscribe',// TODO - 'title' => 'Bookmarklet',// TODO + 'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.', //TODO - Translation + 'label' => 'Subscribe', //TODO - Translation + 'title' => 'Bookmarklet', //TODO - Translation ), 'category' => array( '_' => 'Categoria', @@ -27,7 +27,7 @@ return array( 'password' => 'Senha HTTP', 'username' => 'Usuário HTTP', ), - 'clear_cache' => 'Always clear cache', //TODO + 'clear_cache' => 'Always clear cache', //TODO - Translation 'css_help' => 'Retorna RSS feeds truncados (atenção, requer mais tempo!)', 'css_path' => 'Caminho do CSS do artigo no site original', 'description' => 'Descrição', @@ -36,26 +36,26 @@ return array( 'informations' => 'Informações', 'keep_history' => 'Número mínimo de artigos para manter', 'moved_category_deleted' => 'Quando você deleta uma categoria, seus feeds são automaticamente classificados como %s.', - 'mute' => 'mute', // TODO + 'mute' => 'mute', //TODO - Translation 'no_selected' => 'Nenhum feed selecionado.', 'number_entries' => '%d artigos', 'priority' => array( - '_' => 'Visibility', // TODO - 'archived' => 'Do not show (archived)', // TODO + '_' => 'Visibility', //TODO - Translation + 'archived' => 'Do not show (archived)', //TODO - Translation 'main_stream' => 'Mostrar na tela principal', - 'normal' => 'Show in its category', // TODO + 'normal' => 'Show in its category', //TODO - Translation ), - 'ssl_verify' => 'Verify SSL security', //TODO + 'pubsubhubbub' => 'Notificação instantânea com PubSubHubbub', + 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'Estatísticas', 'think_to_add' => 'Você deve adicionar alguns feeds.', - 'timeout' => 'Timeout in seconds', //TODO + 'timeout' => 'Timeout in seconds', //TODO - Translation 'title' => 'Título', 'title_add' => 'Adicionar o RSS feed', 'ttl' => 'Não atualize automáticamente mais que', 'url' => 'Feed URL', 'validator' => 'Verifique a validade do feed', 'website' => 'URL do site', - 'pubsubhubbub' => 'Notificação instantânea com PubSubHubbub', ), 'import_export' => array( 'export' => 'Exportar', -- cgit v1.2.3 From 7cbfdb4e0932230742060b1d04e86f221a7cb10d Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 1 Dec 2018 22:12:42 +0100 Subject: Filter feeds in error (#2160) https://github.com/FreshRSS/FreshRSS/issues/2146 --- app/Controllers/subscriptionController.php | 2 ++ app/i18n/cz/sub.php | 7 +++++++ app/i18n/de/sub.php | 7 +++++++ app/i18n/en/sub.php | 7 +++++++ app/i18n/es/sub.php | 7 +++++++ app/i18n/fr/sub.php | 7 +++++++ app/i18n/he/sub.php | 7 +++++++ app/i18n/it/sub.php | 7 +++++++ app/i18n/kr/sub.php | 7 +++++++ app/i18n/nl/sub.php | 7 +++++++ app/i18n/oc/sub.php | 7 +++++++ app/i18n/pt-br/sub.php | 7 +++++++ app/i18n/ru/sub.php | 7 +++++++ app/i18n/tr/sub.php | 7 +++++++ app/i18n/zh-cn/sub.php | 7 +++++++ app/views/subscription/index.phtml | 17 +++++++++++++++++ 16 files changed, 117 insertions(+) (limited to 'app/i18n/pt-br/sub.php') diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php index 0b1439ba5..46503fc19 100644 --- a/app/Controllers/subscriptionController.php +++ b/app/Controllers/subscriptionController.php @@ -33,6 +33,8 @@ class FreshRSS_subscription_Controller extends Minz_ActionController { @filemtime(PUBLIC_PATH . '/scripts/category.js'))); Minz_View::prependTitle(_t('sub.title') . ' · '); + $this->view->onlyFeedsWithError = Minz_Request::paramTernary('error'); + $id = Minz_Request::param('id'); if ($id !== false) { $feedDAO = FreshRSS_Factory::createFeedDao(); diff --git a/app/i18n/cz/sub.php b/app/i18n/cz/sub.php index fc06fb4dc..ec4c6f374 100644 --- a/app/i18n/cz/sub.php +++ b/app/i18n/cz/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Show in its category', //TODO - Translation ), 'pubsubhubbub' => 'Okamžité oznámení s PubSubHubbub', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'Statistika', 'think_to_add' => 'Můžete přidat kanály.', diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php index 32446c3fa..c4455c4be 100644 --- a/app/i18n/de/sub.php +++ b/app/i18n/de/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Zeige in eigener Kategorie', ), 'pubsubhubbub' => 'Sofortbenachrichtigung mit PubSubHubbub', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Überprüfe SSL Sicherheit', 'stats' => 'Statistiken', 'think_to_add' => 'Sie können Feeds hinzufügen.', diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php index 154d42e95..1dac808b0 100644 --- a/app/i18n/en/sub.php +++ b/app/i18n/en/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Show in its category', ), 'pubsubhubbub' => 'Instant notification with PubSubHubbub', + 'show' => array( + 'all' => 'Show all feeds', + 'error' => 'Show only feeds with error', + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', + ), 'ssl_verify' => 'Verify SSL security', 'stats' => 'Statistics', 'think_to_add' => 'You may add some feeds.', diff --git a/app/i18n/es/sub.php b/app/i18n/es/sub.php index 02f4b270f..b6a7eb568 100755 --- a/app/i18n/es/sub.php +++ b/app/i18n/es/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Show in its category', //TODO - Translation ), 'pubsubhubbub' => 'Notificación inmedaiata con PubSubHubbub', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'Estadísticas', 'think_to_add' => 'Puedes añadir fuentes.', diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php index c48aaf6c7..b5eaccef4 100644 --- a/app/i18n/fr/sub.php +++ b/app/i18n/fr/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Afficher dans sa catégorie', ), 'pubsubhubbub' => 'Notification instantanée par PubSubHubbub', + 'show' => array( + 'all' => 'Montrer tous les flux', + 'error' => 'Montrer seulement les flux en erreur', + ), + 'showing' => array( + 'error' => 'Montre seulement les flux en erreur', + ), 'ssl_verify' => 'Vérification sécurité SSL', 'stats' => 'Statistiques', 'think_to_add' => 'Vous pouvez ajouter des flux.', diff --git a/app/i18n/he/sub.php b/app/i18n/he/sub.php index 474abb8ad..f467df28c 100644 --- a/app/i18n/he/sub.php +++ b/app/i18n/he/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Show in its category', //TODO - Translation ), 'pubsubhubbub' => 'Instant notification with PubSubHubbub', //TODO - Translation + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'סטטיסטיקות', 'think_to_add' => 'ניתן להוסיף הזנות חדשות.', diff --git a/app/i18n/it/sub.php b/app/i18n/it/sub.php index 3cf869dd4..cbb488f3e 100644 --- a/app/i18n/it/sub.php +++ b/app/i18n/it/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Show in its category', //TODO - Translation ), 'pubsubhubbub' => 'Notifica istantanea con PubSubHubbub', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'Statistiche', 'think_to_add' => 'Aggiungi feed.', diff --git a/app/i18n/kr/sub.php b/app/i18n/kr/sub.php index 9595a045e..785a3ea96 100644 --- a/app/i18n/kr/sub.php +++ b/app/i18n/kr/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => '피드가 속한 카테고리에만 표시하기', ), 'pubsubhubbub' => 'PubSubHubbub을 사용한 즉시 알림', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'SSL 유효성 검사', 'stats' => '통계', 'think_to_add' => '피드를 추가할 수 있습니다.', diff --git a/app/i18n/nl/sub.php b/app/i18n/nl/sub.php index 7b1e3727e..53954ad3f 100644 --- a/app/i18n/nl/sub.php +++ b/app/i18n/nl/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Toon in categorie', ), 'pubsubhubbub' => 'Directe notificaties met PubSubHubbub', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'SSL-veiligheid controleren', 'stats' => 'Statistieken', 'think_to_add' => 'Voeg wat feeds toe.', diff --git a/app/i18n/oc/sub.php b/app/i18n/oc/sub.php index c553a8af4..1d2e0007b 100644 --- a/app/i18n/oc/sub.php +++ b/app/i18n/oc/sub.php @@ -45,6 +45,13 @@ return array( 'normal' => 'Mostar dins sa categoria', ), 'pubsubhubbub' => 'Notificaciones instantáneas amb PubSubHubbub', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verificacion de la seguretat SSL', 'stats' => 'Estatisticas', 'think_to_add' => 'Podètz ajustar de fluxes.', diff --git a/app/i18n/pt-br/sub.php b/app/i18n/pt-br/sub.php index 15986d6c3..03ae9d014 100644 --- a/app/i18n/pt-br/sub.php +++ b/app/i18n/pt-br/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Show in its category', //TODO - Translation ), 'pubsubhubbub' => 'Notificação instantânea com PubSubHubbub', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'Estatísticas', 'think_to_add' => 'Você deve adicionar alguns feeds.', diff --git a/app/i18n/ru/sub.php b/app/i18n/ru/sub.php index eccbf818d..ccd3b0020 100644 --- a/app/i18n/ru/sub.php +++ b/app/i18n/ru/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Show in its category', //TODO - Translation ), 'pubsubhubbub' => 'Instant notification with PubSubHubbub', //TODO - Translation + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'Statistics', //TODO - Translation 'think_to_add' => 'You may add some feeds.', //TODO - Translation diff --git a/app/i18n/tr/sub.php b/app/i18n/tr/sub.php index e6adc0353..4d71e3dbf 100644 --- a/app/i18n/tr/sub.php +++ b/app/i18n/tr/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => 'Show in its category', //TODO - Translation ), 'pubsubhubbub' => 'PubSubHubbub ile anlık bildirim', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => 'İstatistikler', 'think_to_add' => 'Akış ekleyebilirsiniz.', diff --git a/app/i18n/zh-cn/sub.php b/app/i18n/zh-cn/sub.php index aab4b1359..49b6e4304 100644 --- a/app/i18n/zh-cn/sub.php +++ b/app/i18n/zh-cn/sub.php @@ -46,6 +46,13 @@ return array( 'normal' => '在分类中显示', ), 'pubsubhubbub' => 'PubSubHubbub 即时通知', + 'show' => array( + 'all' => 'Show all feeds', //TODO - Translation + 'error' => 'Show only feeds with error', //TODO - Translation + ), + 'showing' => array( + 'error' => 'Showing only feeds with error', //TODO - Translation + ), 'ssl_verify' => 'Verify SSL security', //TODO - Translation 'stats' => '统计', 'think_to_add' => '你可以添加一些 RSS 源。', diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml index 41dd8a7df..8b196cb00 100644 --- a/app/views/subscription/index.phtml +++ b/app/views/subscription/index.phtml @@ -52,6 +52,12 @@ default_category->name()); ?>

+ onlyFeedsWithError): ?> +

+ +

+ +
@@ -122,6 +128,9 @@ onlyFeedsWithError && !$feed->inError()) { + continue; + } $error = $feed->inError() ? ' error' : ''; $empty = $feed->nbEntries() == 0 ? ' empty' : ''; ?> @@ -140,6 +149,14 @@
+ + feed) ? ' class="active"' : ''; ?> -- cgit v1.2.3 From 512d047f02b601dcf21f8c807117ea154967e58f Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 16 Dec 2018 17:02:03 +0100 Subject: Update naming to WebSub (#2184) Instead of PubSubHubbub / PuSH --- README.fr.md | 7 +++++-- README.md | 7 +++++-- app/Controllers/feedController.php | 12 ++++++------ app/Models/Feed.php | 18 +++++++++--------- app/i18n/cz/sub.php | 2 +- app/i18n/de/sub.php | 2 +- app/i18n/en/sub.php | 2 +- app/i18n/es/sub.php | 2 +- app/i18n/fr/sub.php | 2 +- app/i18n/he/sub.php | 2 +- app/i18n/it/sub.php | 2 +- app/i18n/kr/sub.php | 2 +- app/i18n/nl/sub.php | 2 +- app/i18n/oc/sub.php | 2 +- app/i18n/pt-br/sub.php | 2 +- app/i18n/ru/sub.php | 2 +- app/i18n/tr/sub.php | 2 +- app/i18n/zh-cn/sub.php | 2 +- app/views/helpers/feed/update.phtml | 2 +- cli/README.md | 2 +- config.default.php | 2 +- docs/en/users/05_Configuration.md | 2 +- docs/fr/contributing.md | 2 +- docs/fr/users/08_PubSubHubbub.md | 23 ++++++++++++++++------- p/api/pshb.php | 4 ++-- 25 files changed, 62 insertions(+), 47 deletions(-) (limited to 'app/i18n/pt-br/sub.php') diff --git a/README.fr.md b/README.fr.md index 9db5907a0..14d780b18 100644 --- a/README.fr.md +++ b/README.fr.md @@ -8,9 +8,12 @@ FreshRSS est un agrégateur de flux RSS à auto-héberger à l’image de [Leed] Il se veut léger et facile à prendre en main tout en étant un outil puissant et paramétrable. -Il permet de gérer plusieurs utilisateurs, et dispose d’un mode de lecture anonyme. -Il supporte les étiquettes personnalisées, et [PubSubHubbub](https://github.com/pubsubhubbub/PubSubHubbub) pour des notifications instantanées depuis les sites compatibles. +Il permet de gérer plusieurs utilisateurs, dispose d’un mode de lecture anonyme, et supporte les étiquettes personnalisées. Il y a une API pour les clients (mobiles), ainsi qu’une [interface en ligne de commande](cli/README.md). + +Grâce au standard [WebSub](https://www.w3.org/TR/websub/) (anciennement [PubSubHubbub](https://github.com/pubsubhubbub/PubSubHubbub)), +FreshRSS est capable de recevoir des notifications push instantanées depuis les sources compatibles, telles [Mastodon](https://joinmastodon.org), [Friendica](https://friendi.ca), [WordPress](https://wordpress.org/plugins/pubsubhubbub/), Blogger, FeedBurner, etc. + Enfin, il permet l’ajout d’[extensions](#extensions) pour encore plus de personnalisation. Les demandes de fonctionnalités, rapports de bugs, et autres contributions sont les bienvenues. Privilégiez pour cela des [demandes sur GitHub](https://github.com/FreshRSS/FreshRSS/issues). diff --git a/README.md b/README.md index 1904dad2c..4cf598172 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,12 @@ FreshRSS is a self-hosted RSS feed aggregator like [Leed](http://leed.idleman.fr It is lightweight, easy to work with, powerful, and customizable. -It is a multi-user application with an anonymous reading mode. -It supports custom tags, and [PubSubHubbub](https://github.com/pubsubhubbub/PubSubHubbub) for instant notifications from compatible Web sites. +It is a multi-user application with an anonymous reading mode. It supports custom tags. There is an API for (mobile) clients, and a [Command-Line Interface](cli/README.md). + +Thanks to the [WebSub](https://www.w3.org/TR/websub/) standard (formerly [PubSubHubbub](https://github.com/pubsubhubbub/PubSubHubbub)), +FreshRSS is able to receive instant push notifications from compatible sources, such as [Mastodon](https://joinmastodon.org), [Friendica](https://friendi.ca), [WordPress](https://wordpress.org/plugins/pubsubhubbub/), Blogger, FeedBurner, etc. + Finally, it supports [extensions](#extensions) for further tuning. Feature requests, bug reports, and other contributions are welcome. The best way to contribute is to [open an issue on GitHub](https://github.com/FreshRSS/FreshRSS/issues). diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index f2b1b8960..74c9eacfa 100755 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -266,7 +266,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController { $nb_month_old = max(FreshRSS_Context::$user_conf->old_entries, 1); $date_min = time() - (3600 * 24 * 30 * $nb_month_old); - // PubSubHubbub support + // WebSub (PubSubHubbub) support $pubsubhubbubEnabledGeneral = FreshRSS_Context::$system_conf->pubsubhubbub_enabled; $pshbMinAge = time() - (3600 * 24); //TODO: Make a configuration. @@ -437,13 +437,13 @@ class FreshRSS_feed_Controller extends Minz_ActionController { $entryDAO->commit(); } - if ($feed->hubUrl() && $feed->selfUrl()) { //selfUrl has priority for PubSubHubbub + if ($feed->hubUrl() && $feed->selfUrl()) { //selfUrl has priority for WebSub if ($feed->selfUrl() !== $url) { //https://code.google.com/p/pubsubhubbub/wiki/MovingFeedsOrChangingHubs $selfUrl = checkUrl($feed->selfUrl()); if ($selfUrl) { - Minz_Log::debug('PubSubHubbub unsubscribe ' . $feed->url(false)); + Minz_Log::debug('WebSub unsubscribe ' . $feed->url(false)); if (!$feed->pubSubHubbubSubscribe(false)) { //Unsubscribe - Minz_Log::warning('Error while PubSubHubbub unsubscribing from ' . $feed->url(false)); + Minz_Log::warning('Error while WebSub unsubscribing from ' . $feed->url(false)); } $feed->_url($selfUrl, false); Minz_Log::notice('Feed ' . $url . ' canonical address moved to ' . $feed->url(false)); @@ -457,9 +457,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController { $feed->faviconPrepare(); if ($pubsubhubbubEnabledGeneral && $feed->pubSubHubbubPrepare()) { - Minz_Log::notice('PubSubHubbub subscribe ' . $feed->url(false)); + Minz_Log::notice('WebSub subscribe ' . $feed->url(false)); if (!$feed->pubSubHubbubSubscribe(true)) { //Subscribe - Minz_Log::warning('Error while PubSubHubbub subscribing to ' . $feed->url(false)); + Minz_Log::warning('Error while WebSub subscribing to ' . $feed->url(false)); } } $feed->unlock(); diff --git a/app/Models/Feed.php b/app/Models/Feed.php index fc7ed8c68..b21a8bbbe 100644 --- a/app/Models/Feed.php +++ b/app/Models/Feed.php @@ -498,7 +498,7 @@ class FreshRSS_Feed extends Minz_Model { @unlink($this->lockPath); } - // + // public function pubSubHubbubEnabled() { $url = $this->selfUrl ? $this->selfUrl : $this->url; @@ -534,13 +534,13 @@ class FreshRSS_Feed extends Minz_Model { if ($hubFile = @file_get_contents($hubFilename)) { $hubJson = json_decode($hubFile, true); if (!$hubJson || empty($hubJson['key']) || !ctype_xdigit($hubJson['key'])) { - $text = 'Invalid JSON for PubSubHubbub: ' . $this->url; + $text = 'Invalid JSON for WebSub: ' . $this->url; Minz_Log::warning($text); Minz_Log::warning($text, PSHB_LOG); return false; } if ((!empty($hubJson['lease_end'])) && ($hubJson['lease_end'] < (time() + (3600 * 23)))) { //TODO: Make a better policy - $text = 'PubSubHubbub lease ends at ' + $text = 'WebSub lease ends at ' . date('c', empty($hubJson['lease_end']) ? time() : $hubJson['lease_end']) . ' and needs renewal: ' . $this->url; Minz_Log::warning($text); @@ -560,7 +560,7 @@ class FreshRSS_Feed extends Minz_Model { file_put_contents($hubFilename, json_encode($hubJson)); @mkdir(PSHB_PATH . '/keys/'); file_put_contents(PSHB_PATH . '/keys/' . $key . '.txt', base64url_encode($this->selfUrl)); - $text = 'PubSubHubbub prepared for ' . $this->url; + $text = 'WebSub prepared for ' . $this->url; Minz_Log::debug($text); Minz_Log::debug($text, PSHB_LOG); } @@ -579,17 +579,17 @@ class FreshRSS_Feed extends Minz_Model { $hubFilename = PSHB_PATH . '/feeds/' . base64url_encode($url) . '/!hub.json'; $hubFile = @file_get_contents($hubFilename); if ($hubFile === false) { - Minz_Log::warning('JSON not found for PubSubHubbub: ' . $this->url); + Minz_Log::warning('JSON not found for WebSub: ' . $this->url); return false; } $hubJson = json_decode($hubFile, true); if (!$hubJson || empty($hubJson['key']) || !ctype_xdigit($hubJson['key']) || empty($hubJson['hub'])) { - Minz_Log::warning('Invalid JSON for PubSubHubbub: ' . $this->url); + Minz_Log::warning('Invalid JSON for WebSub: ' . $this->url); return false; } $callbackUrl = checkUrl(Minz_Request::getBaseUrl() . '/api/pshb.php?k=' . $hubJson['key']); if ($callbackUrl == '') { - Minz_Log::warning('Invalid callback for PubSubHubbub: ' . $this->url); + Minz_Log::warning('Invalid callback for WebSub: ' . $this->url); return false; } if (!$state) { //unsubscribe @@ -618,7 +618,7 @@ class FreshRSS_Feed extends Minz_Model { $response = curl_exec($ch); $info = curl_getinfo($ch); - Minz_Log::warning('PubSubHubbub ' . ($state ? 'subscribe' : 'unsubscribe') . ' to ' . $url . + Minz_Log::warning('WebSub ' . ($state ? 'subscribe' : 'unsubscribe') . ' to ' . $url . ' via hub ' . $hubJson['hub'] . ' with callback ' . $callbackUrl . ': ' . $info['http_code'] . ' ' . $response, PSHB_LOG); @@ -634,5 +634,5 @@ class FreshRSS_Feed extends Minz_Model { return false; } - // + // } diff --git a/app/i18n/cz/sub.php b/app/i18n/cz/sub.php index ec4c6f374..ad02f6f49 100644 --- a/app/i18n/cz/sub.php +++ b/app/i18n/cz/sub.php @@ -45,7 +45,7 @@ return array( 'main_stream' => 'Zobrazit ve “Všechny kanály”', 'normal' => 'Show in its category', //TODO - Translation ), - 'pubsubhubbub' => 'Okamžité oznámení s PubSubHubbub', + 'websub' => 'Okamžité oznámení s WebSub', 'show' => array( 'all' => 'Show all feeds', //TODO - Translation 'error' => 'Show only feeds with error', //TODO - Translation diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php index c4455c4be..aa408e8c7 100644 --- a/app/i18n/de/sub.php +++ b/app/i18n/de/sub.php @@ -45,7 +45,7 @@ return array( 'main_stream' => 'In Haupt-Feeds zeigen', 'normal' => 'Zeige in eigener Kategorie', ), - 'pubsubhubbub' => 'Sofortbenachrichtigung mit PubSubHubbub', + 'websub' => 'Sofortbenachrichtigung mit WebSub', 'show' => array( 'all' => 'Show all feeds', //TODO - Translation 'error' => 'Show only feeds with error', //TODO - Translation diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php index 1dac808b0..9acbcbf33 100644 --- a/app/i18n/en/sub.php +++ b/app/i18n/en/sub.php @@ -45,7 +45,7 @@ return array( 'main_stream' => 'Show in main stream', 'normal' => 'Show in its category', ), - 'pubsubhubbub' => 'Instant notification with PubSubHubbub', + 'websub' => 'Instant notification with WebSub', 'show' => array( 'all' => 'Show all feeds', 'error' => 'Show only feeds with error', diff --git a/app/i18n/es/sub.php b/app/i18n/es/sub.php index b6a7eb568..64e420dc1 100755 --- a/app/i18n/es/sub.php +++ b/app/i18n/es/sub.php @@ -45,7 +45,7 @@ return array( 'main_stream' => 'Mostrar en salida principal', 'normal' => 'Show in its category', //TODO - Translation ), - 'pubsubhubbub' => 'Notificación inmedaiata con PubSubHubbub', + 'websub' => 'Notificación inmedaiata con WebSub', 'show' => array( 'all' => 'Show all feeds', //TODO - Translation 'error' => 'Show only feeds with error', //TODO - Translation diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php index b5eaccef4..6cb31414d 100644 --- a/app/i18n/fr/sub.php +++ b/app/i18n/fr/sub.php @@ -45,7 +45,7 @@ return array( 'main_stream' => 'Afficher dans le flux principal', 'normal' => 'Afficher dans sa catégorie', ), - 'pubsubhubbub' => 'Notification instantanée par PubSubHubbub', + 'websub' => 'Notification instantanée par WebSub', 'show' => array( 'all' => 'Montrer tous les flux', 'error' => 'Montrer seulement les flux en erreur', diff --git a/app/i18n/he/sub.php b/app/i18n/he/sub.php index f467df28c..e4c487b84 100644 --- a/app/i18n/he/sub.php +++ b/app/i18n/he/sub.php @@ -45,7 +45,7 @@ return array( 'main_stream' => 'הצגה בזרם המרכזי', 'normal' => 'Show in its category', //TODO - Translation ), - 'pubsubhubbub' => 'Instant notification with PubSubHubbub', //TODO - Translation + 'websub' => 'Instant notification with WebSub', //TODO - Translation 'show' => array( 'all' => 'Show all feeds', //TODO - Translation 'error' => 'Show only feeds with error', //TODO - Translation diff --git a/app/i18n/it/sub.php b/app/i18n/it/sub.php index cbb488f3e..6faa48d63 100644 --- a/app/i18n/it/sub.php +++ b/app/i18n/it/sub.php @@ -45,7 +45,7 @@ return array( 'main_stream' => 'Mostra in homepage', //TODO - Translation 'normal' => 'Show in its category', //TODO - Translation ), - 'pubsubhubbub' => 'Notifica istantanea con PubSubHubbub', + 'websub' => 'Notifica istantanea con WebSub', 'show' => array( 'all' => 'Show all feeds', //TODO - Translation 'error' => 'Show only feeds with error', //TODO - Translation diff --git a/app/i18n/kr/sub.php b/app/i18n/kr/sub.php index 785a3ea96..463496c57 100644 --- a/app/i18n/kr/sub.php +++ b/app/i18n/kr/sub.php @@ -45,7 +45,7 @@ return array( 'main_stream' => '메인 스트림에 표시하기', 'normal' => '피드가 속한 카테고리에만 표시하기', ), - 'pubsubhubbub' => 'PubSubHubbub을 사용한 즉시 알림', + 'websub' => 'WebSub을 사용한 즉시 알림', 'show' => array( 'all' => 'Show all feeds', //TODO - Translation 'error' => 'Show only feeds with error', //TODO - Translation diff --git a/app/i18n/nl/sub.php b/app/i18n/nl/sub.php index 53954ad3f..36c96b53f 100644 --- a/app/i18n/nl/sub.php +++ b/app/i18n/nl/sub.php @@ -45,7 +45,7 @@ return array( 'main_stream' => 'Zichtbaar in het overzicht', 'normal' => 'Toon in categorie', ), - 'pubsubhubbub' => 'Directe notificaties met PubSubHubbub', + 'websub' => 'Directe notificaties met WebSub', 'show' => array( 'all' => 'Show all feeds', //TODO - Translation 'error' => 'Show only feeds with error', //TODO - Translation diff --git a/app/i18n/oc/sub.php b/app/i18n/oc/sub.php index 1d2e0007b..f9ddf339a 100644 --- a/app/i18n/oc/sub.php +++ b/app/i18n/oc/sub.php @@ -44,7 +44,7 @@ return array( 'main_stream' => 'Mostar al flux màger', 'normal' => 'Mostar dins sa categoria', ), - 'pubsubhubbub' => 'Notificaciones instantáneas amb PubSubHubbub', + 'websub' => 'Notificaciones instantáneas amb WebSub', 'show' => array( 'all' => 'Show all feeds', //TODO - Translation 'error' => 'Show only feeds with error', //TODO - Translation diff --git a/app/i18n/pt-br/sub.php b/app/i18n/pt-br/sub.php index 03ae9d014..78684c14c 100644 --- a/app/i18n/pt-br/sub.php +++ b/app/i18n/pt-br/sub.php @@ -45,7 +45,7 @@ return array( 'main_stream' => 'Mostrar na tela principal', 'normal' => 'Show in its category', //TODO - Translation ), - 'pubsubhubbub' => 'Notificação instantânea com PubSubHubbub', + 'websub' => 'Notificação instantânea com WebSub', 'show' => array( 'all' => 'Show all feeds', //TODO - Translation 'error' => 'Show only feeds with error', //TODO - Translation diff --git a/app/i18n/ru/sub.php b/app/i18n/ru/sub.php index ccd3b0020..7de80586b 100644 --- a/app/i18n/ru/sub.php +++ b/app/i18n/ru/sub.php @@ -45,7 +45,7 @@ return array( 'main_stream' => 'Show in main stream', //TODO - Translation 'normal' => 'Show in its category', //TODO - Translation ), - 'pubsubhubbub' => 'Instant notification with PubSubHubbub', //TODO - Translation + 'websub' => 'Instant notification with WebSub', //TODO - Translation 'show' => array( 'all' => 'Show all feeds', //TODO - Translation 'error' => 'Show only feeds with error', //TODO - Translation diff --git a/app/i18n/tr/sub.php b/app/i18n/tr/sub.php index 4d71e3dbf..b5b56f4b8 100644 --- a/app/i18n/tr/sub.php +++ b/app/i18n/tr/sub.php @@ -45,7 +45,7 @@ return array( 'main_stream' => 'Ana akışda göster', 'normal' => 'Show in its category', //TODO - Translation ), - 'pubsubhubbub' => 'PubSubHubbub ile anlık bildirim', + 'websub' => 'WebSub ile anlık bildirim', 'show' => array( 'all' => 'Show all feeds', //TODO - Translation 'error' => 'Show only feeds with error', //TODO - Translation diff --git a/app/i18n/zh-cn/sub.php b/app/i18n/zh-cn/sub.php index 49b6e4304..e1c176bc6 100644 --- a/app/i18n/zh-cn/sub.php +++ b/app/i18n/zh-cn/sub.php @@ -45,7 +45,7 @@ return array( 'main_stream' => '在首页中显示', 'normal' => '在分类中显示', ), - 'pubsubhubbub' => 'PubSubHubbub 即时通知', + 'websub' => 'WebSub 即时通知', 'show' => array( 'all' => 'Show all feeds', //TODO - Translation 'error' => 'Show only feeds with error', //TODO - Translation diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml index 4dbaacd04..bc90ba456 100644 --- a/app/views/helpers/feed/update.phtml +++ b/app/views/helpers/feed/update.phtml @@ -133,7 +133,7 @@
- +