From 85cbfcedb50b3a579d13697b4ec27c87450f68a7 Mon Sep 17 00:00:00 2001 From: Alexis Degrugillier Date: Thu, 7 Jan 2021 15:47:39 -0500 Subject: Update user query feature (#3338) * Change user query wording There was some misunderstanding in the use of the user query feature, probably because of the wording. I've change it to make it more obvious. * Fix feedback when a query is bookmarked Before, the displayed query name was not the one intended. Now, the name is the one of the current bookmark * Document user queries I've added a few words on how to use the user queries because it seems there was some misunderstanding. See #3219 --- app/Controllers/configureController.php | 4 ++-- app/Models/UserQuery.php | 2 +- app/i18n/cz/index.php | 2 +- app/i18n/de/index.php | 2 +- app/i18n/en-us/index.php | 2 +- app/i18n/en/index.php | 2 +- app/i18n/es/index.php | 2 +- app/i18n/fr/index.php | 2 +- app/i18n/he/index.php | 2 +- app/i18n/it/index.php | 2 +- app/i18n/kr/index.php | 2 +- app/i18n/nl/index.php | 2 +- app/i18n/oc/index.php | 2 +- app/i18n/pl/index.php | 2 +- app/i18n/pt-br/index.php | 2 +- app/i18n/ru/index.php | 2 +- app/i18n/sk/index.php | 2 +- app/i18n/tr/index.php | 2 +- app/i18n/zh-cn/index.php | 2 +- app/layout/nav_menu.phtml | 4 ++-- 20 files changed, 22 insertions(+), 22 deletions(-) (limited to 'app') diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php index db390e4c1..5c8814895 100755 --- a/app/Controllers/configureController.php +++ b/app/Controllers/configureController.php @@ -312,7 +312,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController { * storage. Before it is saved, the unwanted parameters are unset to keep * lean data. */ - public function addQueryAction() { + public function bookmarkQueryAction() { $category_dao = FreshRSS_Factory::createCategoryDao(); $feed_dao = FreshRSS_Factory::createFeedDao(); $tag_dao = FreshRSS_Factory::createTagDao(); @@ -329,7 +329,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController { FreshRSS_Context::$user_conf->queries = $queries; FreshRSS_Context::$user_conf->save(); - Minz_Request::good(_t('feedback.conf.query_created', $query['name']), + Minz_Request::good(_t('feedback.conf.query_created', $params['name']), array('c' => 'configure', 'a' => 'queries')); } diff --git a/app/Models/UserQuery.php b/app/Models/UserQuery.php index f63d2720f..a5a5a6ce2 100644 --- a/app/Models/UserQuery.php +++ b/app/Models/UserQuery.php @@ -42,7 +42,7 @@ class FreshRSS_UserQuery { if (!isset($query['search'])) { $query['search'] = ''; } - // linked to deeply with the search object, need to use dependency injection + // linked too deeply with the search object, need to use dependency injection $this->search = new FreshRSS_BooleanSearch($query['search']); if (isset($query['state'])) { $this->state = $query['state']; diff --git a/app/i18n/cz/index.php b/app/i18n/cz/index.php index 2dd46bbe1..4e691ac2c 100644 --- a/app/i18n/cz/index.php +++ b/app/i18n/cz/index.php @@ -31,9 +31,9 @@ return array( ), 'menu' => array( 'about' => 'O FreshRSS', - 'add_query' => 'Vytvořit dotaz', 'before_one_day' => 'Den nazpět', 'before_one_week' => 'Před týdnem', + 'bookmark_query' => 'Bookmark current query', // TODO - Translation 'favorites' => 'Oblíbené (%s)', 'global_view' => 'Přehled', 'main_stream' => 'Všechny kanály', diff --git a/app/i18n/de/index.php b/app/i18n/de/index.php index 63bc95c88..af7a7e93a 100644 --- a/app/i18n/de/index.php +++ b/app/i18n/de/index.php @@ -31,9 +31,9 @@ return array( ), 'menu' => array( 'about' => 'Über FreshRSS', - 'add_query' => 'Eine Abfrage hinzufügen', 'before_one_day' => 'Vor einem Tag', 'before_one_week' => 'Vor einer Woche', + 'bookmark_query' => 'Bookmark current query', // TODO - Translation 'favorites' => 'Favoriten (%s)', 'global_view' => 'Globale Ansicht', 'main_stream' => 'Haupt-Feeds', diff --git a/app/i18n/en-us/index.php b/app/i18n/en-us/index.php index b4ca969c3..114fdd5ab 100644 --- a/app/i18n/en-us/index.php +++ b/app/i18n/en-us/index.php @@ -31,9 +31,9 @@ return array( ), 'menu' => array( 'about' => 'About FreshRSS', - 'add_query' => 'Add a query', 'before_one_day' => 'Older than one day', 'before_one_week' => 'Older than one week', + 'bookmark_query' => 'Bookmark current query', 'favorites' => 'Favorites (%s)', 'global_view' => 'Global view', 'main_stream' => 'Main stream', diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php index 8f240f58d..261d9bf7b 100644 --- a/app/i18n/en/index.php +++ b/app/i18n/en/index.php @@ -31,9 +31,9 @@ return array( ), 'menu' => array( 'about' => 'About FreshRSS', - 'add_query' => 'Add a query', 'before_one_day' => 'Older than one day', 'before_one_week' => 'Older than one week', + 'bookmark_query' => 'Bookmark current query', 'favorites' => 'Favourites (%s)', 'global_view' => 'Global view', 'main_stream' => 'Main stream', diff --git a/app/i18n/es/index.php b/app/i18n/es/index.php index 28dc1a6d2..dac4a8b2a 100755 --- a/app/i18n/es/index.php +++ b/app/i18n/es/index.php @@ -31,9 +31,9 @@ return array( ), 'menu' => array( 'about' => 'Acerca de FreshRSS', - 'add_query' => 'Añadir petición', 'before_one_day' => 'Con más de 1 día', 'before_one_week' => 'Con más de una semana', + 'bookmark_query' => 'Bookmark current query', // TODO - Translation 'favorites' => 'Favoritos (%s)', 'global_view' => 'Vista Global', 'main_stream' => 'Salida Principal', diff --git a/app/i18n/fr/index.php b/app/i18n/fr/index.php index 1197643ed..9f417d575 100644 --- a/app/i18n/fr/index.php +++ b/app/i18n/fr/index.php @@ -31,9 +31,9 @@ return array( ), 'menu' => array( 'about' => 'À propos de FreshRSS', - 'add_query' => 'Créer un filtre', 'before_one_day' => 'Antérieurs à 1 jour', 'before_one_week' => 'Antérieurs à 1 semaine', + 'bookmark_query' => 'Enregistrer la recherche courante', 'favorites' => 'Favoris (%s)', 'global_view' => 'Vue globale', 'main_stream' => 'Flux principal', diff --git a/app/i18n/he/index.php b/app/i18n/he/index.php index b42a321fe..121e689b2 100644 --- a/app/i18n/he/index.php +++ b/app/i18n/he/index.php @@ -31,9 +31,9 @@ return array( ), 'menu' => array( 'about' => 'אודות FreshRSS', - 'add_query' => 'הוספת שאילתה', 'before_one_day' => 'אתמול', 'before_one_week' => 'לפני שבוע', + 'bookmark_query' => 'Bookmark current query', // TODO - Translation 'favorites' => 'מועדפים (%s)', 'global_view' => 'תצוגה גלובלית', 'main_stream' => 'הזנה ראשית', diff --git a/app/i18n/it/index.php b/app/i18n/it/index.php index 9f81f7704..4418fe5fb 100644 --- a/app/i18n/it/index.php +++ b/app/i18n/it/index.php @@ -31,9 +31,9 @@ return array( ), 'menu' => array( 'about' => 'Informazioni', - 'add_query' => 'Aggiungi ricerca', 'before_one_day' => 'Giorno precedente', 'before_one_week' => 'Settimana precedente', + 'bookmark_query' => 'Bookmark current query', // TODO - Translation 'favorites' => 'Preferiti (%s)', 'global_view' => 'Vista globale per categorie', 'main_stream' => 'Flusso principale', diff --git a/app/i18n/kr/index.php b/app/i18n/kr/index.php index 4d98ff778..27c6d213f 100644 --- a/app/i18n/kr/index.php +++ b/app/i18n/kr/index.php @@ -31,9 +31,9 @@ return array( ), 'menu' => array( 'about' => 'FreshRSS 정보', - 'add_query' => '쿼리 만들기', 'before_one_day' => '하루 이전', 'before_one_week' => '한 주 이전', + 'bookmark_query' => 'Bookmark current query', // TODO - Translation 'favorites' => '즐겨찾기 (%s)', 'global_view' => '전체 모드', 'main_stream' => '메인 스트림', diff --git a/app/i18n/nl/index.php b/app/i18n/nl/index.php index 83b5ed708..b89c408b4 100644 --- a/app/i18n/nl/index.php +++ b/app/i18n/nl/index.php @@ -31,9 +31,9 @@ return array( ), 'menu' => array( 'about' => 'Over FreshRSS', - 'add_query' => 'Voeg een query toe', 'before_one_day' => 'Ouder dan een dag', 'before_one_week' => 'Ouder dan een week', + 'bookmark_query' => 'Bookmark current query', // TODO - Translation 'favorites' => 'Favorieten (%s)', 'global_view' => 'Globale weergave', 'main_stream' => 'Overzicht', diff --git a/app/i18n/oc/index.php b/app/i18n/oc/index.php index abe03f1a3..7979f23bb 100644 --- a/app/i18n/oc/index.php +++ b/app/i18n/oc/index.php @@ -31,9 +31,9 @@ return array( ), 'menu' => array( 'about' => 'A prepaus de FreshRSS', - 'add_query' => 'Crear un filtre', 'before_one_day' => '1 jorn en arrièr', 'before_one_week' => '1 setmana en arrièr', + 'bookmark_query' => 'Bookmark current query', // TODO - Translation 'favorites' => 'Favorits (%s)', 'global_view' => 'Vista generala', 'main_stream' => 'Flux màger', diff --git a/app/i18n/pl/index.php b/app/i18n/pl/index.php index 434ed5c4b..1442b3251 100644 --- a/app/i18n/pl/index.php +++ b/app/i18n/pl/index.php @@ -31,9 +31,9 @@ return array( ), 'menu' => array( 'about' => 'O serwisie FreshRSS', - 'add_query' => 'Zapisz wyszukiwanie', 'before_one_day' => 'Starsze niż dzień', 'before_one_week' => 'Starsze niż tydzień', + 'bookmark_query' => 'Bookmark current query', // TODO - Translation 'favorites' => 'Ulubione (%s)', 'global_view' => 'Widok globalny', 'main_stream' => 'Kanał główny', diff --git a/app/i18n/pt-br/index.php b/app/i18n/pt-br/index.php index fc405d555..92ce19a6c 100644 --- a/app/i18n/pt-br/index.php +++ b/app/i18n/pt-br/index.php @@ -31,9 +31,9 @@ return array( ), 'menu' => array( 'about' => 'Sobre o FreshRSS', - 'add_query' => 'Adicionar uma query', 'before_one_day' => 'Antes de um dia', 'before_one_week' => 'Antes de uma semana', + 'bookmark_query' => 'Bookmark current query', // TODO - Translation 'favorites' => 'Favoritos (%s)', 'global_view' => 'Visualização global', 'main_stream' => 'Stream principal', diff --git a/app/i18n/ru/index.php b/app/i18n/ru/index.php index 1640b0a93..8f94aa171 100644 --- a/app/i18n/ru/index.php +++ b/app/i18n/ru/index.php @@ -31,9 +31,9 @@ return array( ), 'menu' => array( 'about' => 'About FreshRSS', // TODO - Translation - 'add_query' => 'Add a query', // TODO - Translation 'before_one_day' => 'Older than one day', // TODO - Translation 'before_one_week' => 'Older than one week', // TODO - Translation + 'bookmark_query' => 'Bookmark current query', // TODO - Translation 'favorites' => 'Favourites (%s)', // TODO - Translation 'global_view' => 'Global view', // TODO - Translation 'main_stream' => 'Main stream', // TODO - Translation diff --git a/app/i18n/sk/index.php b/app/i18n/sk/index.php index 995bc05cd..7993e7c21 100644 --- a/app/i18n/sk/index.php +++ b/app/i18n/sk/index.php @@ -31,9 +31,9 @@ return array( ), 'menu' => array( 'about' => 'O FreshRSS', - 'add_query' => 'Vytvoriť dopyt', 'before_one_day' => 'Pred 1 dňom', 'before_one_week' => 'Pred 1 týždňom', + 'bookmark_query' => 'Bookmark current query', // TODO - Translation 'favorites' => 'Obľúbené (%s)', 'global_view' => 'Prehľad', 'main_stream' => 'Všetky kanály', diff --git a/app/i18n/tr/index.php b/app/i18n/tr/index.php index fb7749448..092c8490b 100644 --- a/app/i18n/tr/index.php +++ b/app/i18n/tr/index.php @@ -31,9 +31,9 @@ return array( ), 'menu' => array( 'about' => 'FreshRSS hakkında', - 'add_query' => 'Sorgu ekle', 'before_one_day' => 'Bir gün önce', 'before_one_week' => 'Bir hafta önce', + 'bookmark_query' => 'Bookmark current query', // TODO - Translation 'favorites' => 'Favoriler (%s)', 'global_view' => 'Global görünüm', 'main_stream' => 'Ana akış', diff --git a/app/i18n/zh-cn/index.php b/app/i18n/zh-cn/index.php index 21376cd21..e8dca30cc 100644 --- a/app/i18n/zh-cn/index.php +++ b/app/i18n/zh-cn/index.php @@ -31,9 +31,9 @@ return array( ), 'menu' => array( 'about' => '关于 FreshRSS', - 'add_query' => '添加查询', 'before_one_day' => '一天前', 'before_one_week' => '一周前', + 'bookmark_query' => 'Bookmark current query', // TODO - Translation 'favorites' => '收藏（%s）', 'global_view' => '全屏视图', 'main_stream' => '首页', diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml index 124189c68..04731cc8a 100644 --- a/app/layout/nav_menu.phtml +++ b/app/layout/nav_menu.phtml @@ -54,9 +54,9 @@ -
    • +
    • -- cgit v1.2.3