diff --git a/src/controllers/SearchController.php b/src/controllers/SearchController.php index e5e7cf14f..015fa31d6 100755 --- a/src/controllers/SearchController.php +++ b/src/controllers/SearchController.php @@ -612,12 +612,18 @@ class SearchController extends Controller implements CrawlConstants array_column($media_categories, 'NAME'))) !== false) { $data['CATEGORY'] = $_REQUEST['category']; $data['CATEGORY_TYPE'] = $media_categories[$key]['TYPE']; + } else { + $fail_category = $this->clean($_REQUEST['category'], 'string'); + $data['SCRIPT'] .= + "doMessage('<h1 class=\"red\" >". + tl('search_controller_no_trend_category', + $fail_category). + "</h1>');"; } $subsearch = $source_model->getSubsearch($data['CATEGORY']); $data['CATEGORY_NAME'] = ($subsearch) ? $source_model->getSubsearchName($data['CATEGORY'], $data['LOCALE_TAG']) : false; - $data['MEDIA_CATEGORIES'] = []; $data['QUERY'] = "trending:" . $data['CATEGORY']; $order = []; if (!empty($_REQUEST['order'])) { @@ -641,15 +647,6 @@ class SearchController extends Controller implements CrawlConstants C\CSRF_TOKEN . "=" . $data[C\CSRF_TOKEN] . "&": "?"; $trending_url = B\controllerUrl('trending', $logged_in) . $token_query; - foreach ($media_categories as $category_info) { - $category = $category_info['NAME']; - $category_name = $source_model->getSubsearchName( - $category, $data['LOCALE_TAG']); - $category_name = ($category_name == $category) ? - ucfirst($category_name) : $category_name; - $data['MEDIA_CATEGORIES'][$trending_url . "category=" . - $category] = $category_name; - } if ($arg == 'chart' && !empty($_REQUEST['term']) && !empty($_REQUEST['period'])) { $terms = (is_array($_REQUEST['term'])) ? diff --git a/src/index.php b/src/index.php index a4dc83f5c..09c2635c0 100644 --- a/src/index.php +++ b/src/index.php @@ -241,7 +241,6 @@ function configureRewrites($web_site) 'user' => 'routeFeeds', 's' => "routeSubsearch", 'suggest' => 'routeSuggest', - 'trending' => 'routeTrending', 'p' => 'routeWiki' ]; if (class_exists(C\NS. "Routes")) { @@ -559,21 +558,6 @@ function feedsUrl($type, $id, $with_delim = false, $controller = "group") return "$base_url$query$delim"; } } -/** - * Used to route requests to the trending page page. - * If redirects on, then /trending routes to this trending page. - * - * @param array $route_args of url parts (split on slash). - * @return bool whether was able to compute a route or not - */ -function routeTrending($route_args) -{ - $_REQUEST['c'] = "search"; - $_REQUEST['a'] = "trending"; - $_REQUEST['route']['c'] = true; - $_REQUEST['route']['a'] = true; - return true; -} /** * Used to route page requests to end-user controllers such as * register, admin. urls ending with /controller_name will diff --git a/src/locale/ar/configure.ini b/src/locale/ar/configure.ini index 008bb9b78..22cecf25c 100755 --- a/src/locale/ar/configure.ini +++ b/src/locale/ar/configure.ini @@ -91,6 +91,7 @@ search_controller_this_week = "هذا الأسبوع" search_controller_this_month = "هذا الشهر" search_controller_this_year = "هذا العام" settings_controller_settings_saved = "حفظ الإعدادات!" +search_controller_no_trend_category = "" search_controller_mix_info = "استخدام مزيج الزحف: %s" search_controller_crawl_info = "ويب الوثيقة: %s. الحجم: %s صفحات وعناوين URL %s" search_controller_search = "البحث" @@ -1507,7 +1508,6 @@ trending_element_daily = "الأعلى اليومي" trending_element_weekly = "أعلى الأسبوعية" trending_element_monthly = "أعلى الشهري" trending_element_yearly = "سنويا" -trending_element_trending = "تتجه..." trending_element_trending_terms = "تتجه %s" trending_element_chart = "" trending_element_term = "المدى" diff --git a/src/locale/bn/configure.ini b/src/locale/bn/configure.ini index 0c5df99b6..236905d19 100755 --- a/src/locale/bn/configure.ini +++ b/src/locale/bn/configure.ini @@ -91,6 +91,7 @@ search_controller_this_week = "এই সপ্তাহে" search_controller_this_month = "এই মাস" search_controller_this_year = "এই বছর" settings_controller_settings_saved = "সেটিংস সংরক্ষিত!" +search_controller_no_trend_category = "" search_controller_mix_info = "ব্যবহার করে হামাগুড়ি মিশ্রণ: %s" search_controller_crawl_info = "সূচক: %s -- আয়তন: পেজ %s/%s url গুলি" search_controller_search = "অনুসন্ধান" @@ -1507,7 +1508,6 @@ trending_element_daily = "শীর্ষ দৈনিক" trending_element_weekly = "শীর্ষ সাপ্তাহিক" trending_element_monthly = "শীর্ষ মাসিক" trending_element_yearly = "বাত্সরিক" -trending_element_trending = "গতিবিধি..." trending_element_trending_terms = "গতিবিধি %s" trending_element_chart = "" trending_element_term = "শব্দটি" diff --git a/src/locale/de/configure.ini b/src/locale/de/configure.ini index 19127e8c0..e7571d911 100755 --- a/src/locale/de/configure.ini +++ b/src/locale/de/configure.ini @@ -91,6 +91,7 @@ search_controller_this_week = "Diese Woche" search_controller_this_month = "In diesem Monat" search_controller_this_year = "In Diesem Jahr" settings_controller_settings_saved = "Einstellungen Gespeichert!" +search_controller_no_trend_category = "" search_controller_mix_info = "Mit Crawl-Mix: %s" search_controller_crawl_info = "Index: %s -- Größe: %s pages/%s urls" search_controller_search = "Suche" @@ -1507,7 +1508,6 @@ trending_element_daily = "Top Täglich" trending_element_weekly = "Top-Wöchentliche" trending_element_monthly = "Top-Monatliche" trending_element_yearly = "Jährlich" -trending_element_trending = "Trending..." trending_element_trending_terms = "Trending %s" trending_element_chart = "" trending_element_term = "Begriff" diff --git a/src/locale/en_US/configure.ini b/src/locale/en_US/configure.ini index 7e74ceb08..2e8dab5ce 100644 --- a/src/locale/en_US/configure.ini +++ b/src/locale/en_US/configure.ini @@ -91,6 +91,7 @@ search_controller_this_week = "This week" search_controller_this_month = "This month" search_controller_this_year = "This Year" settings_controller_settings_saved = "Settings Saved!" +search_controller_no_trend_category = "Trend Category %s Does Not Exists!" search_controller_mix_info = "Using Crawl Mix: %s" search_controller_crawl_info = "Index: %s -- Size: %s pages/%s urls" search_controller_search = "Search" @@ -1507,7 +1508,6 @@ trending_element_daily = "Top Daily" trending_element_weekly = "Top Weekly" trending_element_monthly = "Top Monthly" trending_element_yearly = "Yearly" -trending_element_trending = "Trending..." trending_element_trending_terms = "Trending %s" trending_element_chart = "Chart" trending_element_term = "Term" diff --git a/src/locale/es/configure.ini b/src/locale/es/configure.ini index a7432c73d..eebd05d6e 100755 --- a/src/locale/es/configure.ini +++ b/src/locale/es/configure.ini @@ -91,6 +91,7 @@ search_controller_this_week = "Esta semana" search_controller_this_month = "Este mes" search_controller_this_year = "Este Año" settings_controller_settings_saved = "Configuración guardada!" +search_controller_no_trend_category = "" search_controller_mix_info = "Usando Rastreo Mix: %s" search_controller_crawl_info = "Usando Índice: %s -- Size: %s pages/%s urls" search_controller_search = "Búsqueda" @@ -1507,7 +1508,6 @@ trending_element_daily = "Superior A Diario" trending_element_weekly = "Top Semanal" trending_element_monthly = "Top Mensual" trending_element_yearly = "Anual" -trending_element_trending = "Trending..." trending_element_trending_terms = "Trending %s" trending_element_chart = "" trending_element_term = "Plazo" diff --git a/src/locale/fa/configure.ini b/src/locale/fa/configure.ini index a2f6a8625..1c4f96773 100755 --- a/src/locale/fa/configure.ini +++ b/src/locale/fa/configure.ini @@ -91,6 +91,7 @@ search_controller_this_week = "این هفته" search_controller_this_month = "این ماه" search_controller_this_year = "در این سال" settings_controller_settings_saved = "تنظیمات ذخیره شد!" +search_controller_no_trend_category = "" search_controller_mix_info = "با استفاده از ترکیب خزش: %s" search_controller_crawl_info = "نمایه: %s -- اندازه: %s صفحات/%s urls" search_controller_search = "بگرد" @@ -1507,7 +1508,6 @@ trending_element_daily = "بالا روزانه" trending_element_weekly = "بالا هفتگی" trending_element_monthly = "بالا ماهانه" trending_element_yearly = "سالانه" -trending_element_trending = "روند..." trending_element_trending_terms = "روند %s" trending_element_chart = "" trending_element_term = "مدت" diff --git a/src/locale/fr_FR/configure.ini b/src/locale/fr_FR/configure.ini index 49a36a377..f34aa5473 100755 --- a/src/locale/fr_FR/configure.ini +++ b/src/locale/fr_FR/configure.ini @@ -91,6 +91,7 @@ search_controller_this_week = "Cette semaine" search_controller_this_month = "Ce mois-ci" search_controller_this_year = "Cette année" settings_controller_settings_saved = "Configurations sauvegardées" +search_controller_no_trend_category = "" search_controller_mix_info = "À l'aide d'analyse de mélange: %s" search_controller_crawl_info = "L'index: %s -- Taille: %s pages / %s urls" search_controller_search = "Afficher les résultats pour " @@ -1507,7 +1508,6 @@ trending_element_daily = "Top quotidienne" trending_element_weekly = "Top hebdomadaire" trending_element_monthly = "Top mensuel" trending_element_yearly = "Annuelle" -trending_element_trending = "La tendance..." trending_element_trending_terms = "Tendance %s" trending_element_chart = "" trending_element_term = "Terme" diff --git a/src/locale/he/configure.ini b/src/locale/he/configure.ini index b5eb1e868..5ee7fd02e 100755 --- a/src/locale/he/configure.ini +++ b/src/locale/he/configure.ini @@ -91,6 +91,7 @@ search_controller_this_week = "השבוע" search_controller_this_month = "החודש" search_controller_this_year = "השנה" settings_controller_settings_saved = "הגדרות שנשמרו!" +search_controller_no_trend_category = "" search_controller_mix_info = "באמצעות לזחול מיקס: %s" search_controller_crawl_info = "Index: %s -- גודל: %s דפים/%s כתובות" search_controller_search = "חיפוש" @@ -1507,7 +1508,6 @@ trending_element_daily = "העליון יומי" trending_element_weekly = "העליון שבועי" trending_element_monthly = "העליון חודשי" trending_element_yearly = "שנתי" -trending_element_trending = "במגמה..." trending_element_trending_terms = "במגמת %s" trending_element_chart = "" trending_element_term = "המונח" diff --git a/src/locale/hi/configure.ini b/src/locale/hi/configure.ini index 850d8df86..9a7036e52 100755 --- a/src/locale/hi/configure.ini +++ b/src/locale/hi/configure.ini @@ -91,6 +91,7 @@ search_controller_this_week = "इस सप्ताह" search_controller_this_month = "इस महीने" search_controller_this_year = "इस वर्ष" settings_controller_settings_saved = "सेटिंग्स सहेज दी गई है" +search_controller_no_trend_category = "" search_controller_mix_info = "का उपयोग क्रॉल मिश्रण: %s" search_controller_crawl_info = "क्रॉल जानकारी " search_controller_search = "खोज" @@ -1507,7 +1508,6 @@ trending_element_daily = "शीर्ष दैनिक" trending_element_weekly = "शीर्ष साप्ताहिक" trending_element_monthly = "शीर्ष मासिक" trending_element_yearly = "वार्षिक" -trending_element_trending = "ट्रेंडिंग..." trending_element_trending_terms = "ट्रेंडिंग %s" trending_element_chart = "" trending_element_term = "शब्द" diff --git a/src/locale/id/configure.ini b/src/locale/id/configure.ini index e6d489845..3873f0025 100755 --- a/src/locale/id/configure.ini +++ b/src/locale/id/configure.ini @@ -91,6 +91,7 @@ search_controller_this_week = "Minggu ini" search_controller_this_month = "Bulan ini" search_controller_this_year = "Tahun Ini" settings_controller_settings_saved = "Pengaturan Disimpan!" +search_controller_no_trend_category = "" search_controller_mix_info = "Menggunakan Merangkak Mix: %s" search_controller_crawl_info = "Indeks: %s -- Ukuran: %s halaman/url %s" search_controller_search = "Pencarian" @@ -1507,7 +1508,6 @@ trending_element_daily = "Atas Setiap Hari" trending_element_weekly = "Top Weekly" trending_element_monthly = "Top Bulanan" trending_element_yearly = "Tahunan" -trending_element_trending = "Trending..." trending_element_trending_terms = "Tren %s" trending_element_chart = "" trending_element_term = "Istilah" diff --git a/src/locale/it/configure.ini b/src/locale/it/configure.ini index 34db24fe6..4978b7369 100755 --- a/src/locale/it/configure.ini +++ b/src/locale/it/configure.ini @@ -91,6 +91,7 @@ search_controller_this_week = "Questa settimana" search_controller_this_month = "Questo mese" search_controller_this_year = "Quest'Anno" settings_controller_settings_saved = "Settaggi salvati!" +search_controller_no_trend_category = "" search_controller_mix_info = "Unione Scansioni in uso: %s" search_controller_crawl_info = "Indice in uso: %s -- Dimensioni: %s pagine/%s URL" search_controller_search = "Ricerca" @@ -1507,7 +1508,6 @@ trending_element_daily = "Top Quotidiano" trending_element_weekly = "Top Settimanale" trending_element_monthly = "Top Mensile" trending_element_yearly = "Annuale" -trending_element_trending = "Trend..." trending_element_trending_terms = "Trend %s" trending_element_chart = "" trending_element_term = "Termine" diff --git a/src/locale/ja/configure.ini b/src/locale/ja/configure.ini index 509d4312d..712540835 100755 --- a/src/locale/ja/configure.ini +++ b/src/locale/ja/configure.ini @@ -91,6 +91,7 @@ search_controller_this_week = "この週" search_controller_this_month = "この月" search_controller_this_year = "この年" settings_controller_settings_saved = "設定の保存しました" +search_controller_no_trend_category = "" search_controller_mix_info = "用這ミックス:%s" search_controller_crawl_info = "Index:%s--サイズ:%sページ/url%s" search_controller_search = "検索" @@ -1507,7 +1508,6 @@ trending_element_daily = "Top日" trending_element_weekly = "トップ週間" trending_element_monthly = "Top月" trending_element_yearly = "年間" -trending_element_trending = "おすすめの..." trending_element_trending_terms = "おすすめの%s" trending_element_chart = "" trending_element_term = "期間" diff --git a/src/locale/kn/configure.ini b/src/locale/kn/configure.ini index e65b72a5b..e08cd123d 100755 --- a/src/locale/kn/configure.ini +++ b/src/locale/kn/configure.ini @@ -91,6 +91,7 @@ search_controller_this_week = "ಈ ವಾರ" search_controller_this_month = "ಈ ತಿಂಗಳು" search_controller_this_year = "ಈ ವರ್ಷ" settings_controller_settings_saved = "ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಉಳಿಸಲಾಗಿದೆ!" +search_controller_no_trend_category = "" search_controller_mix_info = "ಬಳಸಿಕೊಂಡು ಕ್ರಾಲ್ ಮಿಶ್ರಣ: %s" search_controller_crawl_info = "ಸೂಚ್ಯಂಕ: %s -- ಗಾತ್ರ: %s ಪುಟಗಳು/%s url ಗಳು" search_controller_search = "ಹುಡುಕಾಟ" @@ -1507,7 +1508,6 @@ trending_element_daily = "ಟಾಪ್ ದೈನಂದಿನ" trending_element_weekly = "ಟಾಪ್ ವಾರದ" trending_element_monthly = "ಟಾಪ್ ಮಾಸಿಕ" trending_element_yearly = "ವಾರ್ಷಿಕ" -trending_element_trending = "ಧೋರಣೆ..." trending_element_trending_terms = "ಟ್ರೆಂಡಿಂಗ್ %s" trending_element_chart = "" trending_element_term = "ಪದ" diff --git a/src/locale/ko/configure.ini b/src/locale/ko/configure.ini index 1c9959a3d..eb1a595b1 100755 --- a/src/locale/ko/configure.ini +++ b/src/locale/ko/configure.ini @@ -91,6 +91,7 @@ search_controller_this_week = "이번 주" search_controller_this_month = "이번 달" search_controller_this_year = "올해" settings_controller_settings_saved = "현재 세팅이 저장됐습니다." +search_controller_no_trend_category = "" search_controller_mix_info = "를 사용하여 크롤링 믹스:%s" search_controller_crawl_info = "지수:%s--크기:%s 페이지/%surl" search_controller_search = "검색" @@ -1507,7 +1508,6 @@ trending_element_daily = "Top 일일" trending_element_weekly = "최고의 주간" trending_element_monthly = "최 월" trending_element_yearly = "연간" -trending_element_trending = "향..." trending_element_trending_terms = "추 %s" trending_element_chart = "" trending_element_term = "기" diff --git a/src/locale/nl/configure.ini b/src/locale/nl/configure.ini index 3233eee80..41905c983 100644 --- a/src/locale/nl/configure.ini +++ b/src/locale/nl/configure.ini @@ -91,6 +91,7 @@ search_controller_this_week = "Deze week" search_controller_this_month = "Deze maand" search_controller_this_year = "Dit Jaar" settings_controller_settings_saved = "Instellingen Opgeslagen!" +search_controller_no_trend_category = "" search_controller_mix_info = "Met behulp van Crawl Mix: %s" search_controller_crawl_info = "Index: %s - Grootte: %s paginas / %s urls" search_controller_search = "zoeken" @@ -1507,7 +1508,6 @@ trending_element_daily = "Top Dagelijkse" trending_element_weekly = "Wekelijkse Top" trending_element_monthly = "Top Maandelijks" trending_element_yearly = "Jaarlijks" -trending_element_trending = "Trending..." trending_element_trending_terms = "Trending %s" trending_element_chart = "" trending_element_term = "Termijn" diff --git a/src/locale/pl/configure.ini b/src/locale/pl/configure.ini index c860c46ea..a61767f80 100755 --- a/src/locale/pl/configure.ini +++ b/src/locale/pl/configure.ini @@ -91,6 +91,7 @@ search_controller_this_week = "W tym tygodniu" search_controller_this_month = "W tym miesiącu" search_controller_this_year = "W Tym Roku" settings_controller_settings_saved = "Ustawienia Są Zapisywane!" +search_controller_no_trend_category = "" search_controller_mix_info = "Za Pomocą Indeksowania Mieszanka: %s" search_controller_crawl_info = "Indeks: %s rozmiar: %s stron/%s adresów" search_controller_search = "Wyszukiwanie" @@ -1507,7 +1508,6 @@ trending_element_daily = "Top Codziennie" trending_element_weekly = "Top Za Tydzień" trending_element_monthly = "Top-Raz W Miesiącu" trending_element_yearly = "Roczny" -trending_element_trending = "Trendy..." trending_element_trending_terms = "Trendy %s" trending_element_chart = "" trending_element_term = "Termin" diff --git a/src/locale/pt/configure.ini b/src/locale/pt/configure.ini index 221f62ac1..b98bad4d4 100755 --- a/src/locale/pt/configure.ini +++ b/src/locale/pt/configure.ini @@ -91,6 +91,7 @@ search_controller_this_week = "Esta semana" search_controller_this_month = "Este mês" search_controller_this_year = "Este Ano" settings_controller_settings_saved = "As Configurações Salvas!" +search_controller_no_trend_category = "" search_controller_mix_info = "Usando O Rastreamento De Mistura: %s" search_controller_crawl_info = "Índice: %s -- Tamanho: %s páginas/urls %s" search_controller_search = "Procura" @@ -1507,7 +1508,6 @@ trending_element_daily = "Diário Superior" trending_element_weekly = "Top Semanal" trending_element_monthly = "Top Mensal" trending_element_yearly = "Anual" -trending_element_trending = "Tendência..." trending_element_trending_terms = "Tendências %s" trending_element_chart = "" trending_element_term = "Prazo" diff --git a/src/locale/ru/configure.ini b/src/locale/ru/configure.ini index e1a168884..ba8a708cf 100755 --- a/src/locale/ru/configure.ini +++ b/src/locale/ru/configure.ini @@ -91,6 +91,7 @@ search_controller_this_week = "На этой неделе" search_controller_this_month = "В этом месяце" search_controller_this_year = "В Этом Году" settings_controller_settings_saved = "Настройки Сохраняются!" +search_controller_no_trend_category = "" search_controller_mix_info = "Используя Ползать Смесь: %s" search_controller_crawl_info = "Индекс: %s-размер: %s страниц/%s адресов" search_controller_search = "Поиск" @@ -1507,7 +1508,6 @@ trending_element_daily = "Топ Ежедневно" trending_element_weekly = "Топ За Неделю" trending_element_monthly = "Топ-Ежемесячный" trending_element_yearly = "Годовой" -trending_element_trending = "Тенденции..." trending_element_trending_terms = "Трендовые %s" trending_element_chart = "" trending_element_term = "Термин" diff --git a/src/locale/te/configure.ini b/src/locale/te/configure.ini index 845f5b36b..a7adda730 100644 --- a/src/locale/te/configure.ini +++ b/src/locale/te/configure.ini @@ -91,6 +91,7 @@ search_controller_this_week = "ఈ వారం" search_controller_this_month = "ఈ నెల" search_controller_this_year = "ఈ సంవత్సరం" settings_controller_settings_saved = "సెట్టింగ్స్ సేవ్ చేయబడినవి!!" +search_controller_no_trend_category = "" search_controller_mix_info = "మిక్స్ క్రాల్ ఉపయోగించబడుతోంది: %s" search_controller_crawl_info = "సూచిక: %s -- పరిమాణము: %s పేజీలు /%s యుఆర్ఎల్ లు" search_controller_search = "అన్వేషించు" @@ -1507,7 +1508,6 @@ trending_element_daily = "టాప్ రోజువారీ" trending_element_weekly = "టాప్ వార" trending_element_monthly = "టాప్ నెలవారీ" trending_element_yearly = "వార్షిక" -trending_element_trending = "తీరు..." trending_element_trending_terms = "ట్రెండింగ్ %s" trending_element_chart = "" trending_element_term = "కాల" diff --git a/src/locale/th/configure.ini b/src/locale/th/configure.ini index 7508ff08d..be49f9e57 100755 --- a/src/locale/th/configure.ini +++ b/src/locale/th/configure.ini @@ -91,6 +91,7 @@ search_controller_this_week = "สัปดาห์นี้" search_controller_this_month = "เดือนนี้" search_controller_this_year = "ปีนี้" settings_controller_settings_saved = "ตั้งค่าช่วย!" +search_controller_no_trend_category = "" search_controller_mix_info = "ใช้คลาส:ทั้งหมด %s" search_controller_crawl_info = "ดัชนี:ทั้งหมด %s--ขนาด:ทั้งหมด %s หน้า/ที่อยู่ url ที่ %s" search_controller_search = "การค้นหา" @@ -1507,7 +1508,6 @@ trending_element_daily = "บนสุดประจำวัน" trending_element_weekly = "สุดสัปดาห์" trending_element_monthly = "ด้านบนเดือน" trending_element_yearly = "ทุกปีใน" -trending_element_trending = "ติดเทรน..." trending_element_trending_terms = "ติดเทรนทั้งหมด %s" trending_element_chart = "" trending_element_term = "ระยะ" diff --git a/src/locale/tl/configure.ini b/src/locale/tl/configure.ini index 2a8c5fbee..be7b77447 100644 --- a/src/locale/tl/configure.ini +++ b/src/locale/tl/configure.ini @@ -91,6 +91,7 @@ search_controller_this_week = "Sa linggong ito" search_controller_this_month = "Sa buwang ito" search_controller_this_year = "Sa Taong Ito" settings_controller_settings_saved = "Mga Setting Ng Na-Save!" +search_controller_no_trend_category = "" search_controller_mix_info = "Gamit Ang Pag-Crawl Mix: %s" search_controller_crawl_info = "Index: %s -- Laki: %s mga pahina/%s mga url" search_controller_search = "Paghahanap" @@ -1507,7 +1508,6 @@ trending_element_daily = "Nangungunang Araw-Araw" trending_element_weekly = "Nangungunang Mga Lingguhang" trending_element_monthly = "Nangungunang Buwanang" trending_element_yearly = "Taon-taon" -trending_element_trending = "Nagte-trend..." trending_element_trending_terms = "Nagte-trend %s" trending_element_chart = "" trending_element_term = "Kataga" diff --git a/src/locale/tr/configure.ini b/src/locale/tr/configure.ini index 26f8ef3e2..8b4ed4542 100755 --- a/src/locale/tr/configure.ini +++ b/src/locale/tr/configure.ini @@ -91,6 +91,7 @@ search_controller_this_week = "Bu hafta" search_controller_this_month = "Bu ay" search_controller_this_year = "Bu Yıl" settings_controller_settings_saved = "Ayarlar Kaydedildi!" +search_controller_no_trend_category = "" search_controller_mix_info = "Gezinme Karışımı Kullanarak: %s" search_controller_crawl_info = "Dizin: %s - Boyutu: %s sayfa/%s urls" search_controller_search = "Arama" @@ -1507,7 +1508,6 @@ trending_element_daily = "Üst Günlük" trending_element_weekly = "Üst Haftalık" trending_element_monthly = "Üst Aylık" trending_element_yearly = "Yıllık" -trending_element_trending = "Trending..." trending_element_trending_terms = "%s Trending " trending_element_chart = "" trending_element_term = "Vadeli" diff --git a/src/locale/vi_VN/configure.ini b/src/locale/vi_VN/configure.ini index aa6584081..e701d010a 100755 --- a/src/locale/vi_VN/configure.ini +++ b/src/locale/vi_VN/configure.ini @@ -91,6 +91,7 @@ search_controller_this_week = "Tuần này" search_controller_this_month = "Tháng này" search_controller_this_year = "Năm Này" settings_controller_settings_saved = "Những cài đặt đã được lưu lại" +search_controller_no_trend_category = "" search_controller_mix_info = "Bằng cách sử dụng kết hợp thu thập dữ liệu %s" search_controller_crawl_info = "Sử dụng chỉ số %s" search_controller_search = "Tìm Kiếm" @@ -1507,7 +1508,6 @@ trending_element_daily = "Đầu Hàng Ngày" trending_element_weekly = "Đầu Hàng Tuần" trending_element_monthly = "Đầu Hàng Tháng" trending_element_yearly = "Hàng năm" -trending_element_trending = "Xu..." trending_element_trending_terms = "Xu hướng %s" trending_element_chart = "" trending_element_term = "Hạn" diff --git a/src/locale/zh_CN/configure.ini b/src/locale/zh_CN/configure.ini index 8c5e7a06f..cbfb5ad12 100755 --- a/src/locale/zh_CN/configure.ini +++ b/src/locale/zh_CN/configure.ini @@ -91,6 +91,7 @@ search_controller_this_week = "这个星期" search_controller_this_month = "这个月" search_controller_this_year = "今年" settings_controller_settings_saved = "設定已儲存" +search_controller_no_trend_category = "" search_controller_mix_info = "使用爬的组合:%s" search_controller_crawl_info = "索引:%s--尺寸:%s网/%s网址" search_controller_search = "搜索" @@ -1507,7 +1508,6 @@ trending_element_daily = "顶日" trending_element_weekly = "顶部的每周" trending_element_monthly = "顶月" trending_element_yearly = "每年" -trending_element_trending = "趋势..." trending_element_trending_terms = "趋势%s" trending_element_chart = "" trending_element_term = "术语" diff --git a/src/views/elements/TrendingElement.php b/src/views/elements/TrendingElement.php index f8f3d7037..efaaf9f7e 100644 --- a/src/views/elements/TrendingElement.php +++ b/src/views/elements/TrendingElement.php @@ -91,22 +91,11 @@ class TrendingElement extends Element $added_term = " media:" . $data['CATEGORY']; $data['CATEGORY_NAME'] = ucfirst($data['CATEGORY']); } - $base_chart_query = "chart:" . $data['CATEGORY'] . ":"; - if (count($data['MEDIA_CATEGORIES']) > 1) { ?> - <h2 class="trending"><?=tl('trending_element_trending'); - ?><?php - $category = array_search($data['CATEGORY_NAME'], - $data['MEDIA_CATEGORIES']); - $this->view->helper("options")->render("media-categories", - "category", $data['MEDIA_CATEGORIES'], - $category, 'window.location = '. - 'this.options[this.selectedIndex].value;');?></h2><?php - } else { ?> - <h2 class="trending"><?=tl('trending_element_trending_terms', - $data['CATEGORY_NAME']); - ?></h2><?php - } - ?><div class="trending-container"><?php + $base_chart_query = "chart:" . $data['CATEGORY'] . ":";?> + <h2 class="trending"><?=tl('trending_element_trending_terms', + $data['CATEGORY_NAME']); + ?></h2> + <div class="trending-container"><?php foreach($data['TREND_DATA'] as $period => $occurrences) { if (empty($occurrences)) { continue;