diff --git a/src/controllers/SearchController.php b/src/controllers/SearchController.php index e26a18751..f66f13d4c 100755 --- a/src/controllers/SearchController.php +++ b/src/controllers/SearchController.php @@ -53,7 +53,7 @@ class SearchController extends Controller implements CrawlConstants * controller will respond to * @var array */ - public $activities = ["query", "cache", "related", "signout", + public $activities = ["query", "cache", "chart", "related", "signout", "recordClick", "trending"]; /** * Name of the sub-search currently in use @@ -131,12 +131,12 @@ class SearchController extends Controller implements CrawlConstants $this->initializeIndexInfo($web_flag, $raw, $data); unset($_SESSION['LAST_ACTIVITY']); if (!empty($_REQUEST['q']) || $activity != "query") { - if ($activity != "cache") { + if (!in_array($activity, ["cache", "trending"])) { $this->processQuery($data, $query, $activity, $arg, $results_per_page, $limit, $index_timestamp, $raw, $save_timestamp); // calculate the results of a search if there is one - } else { + } else if ($activity == "cache") { if (isset($_REQUEST['repository'])) { $ui_array = []; } else { @@ -157,7 +157,7 @@ class SearchController extends Controller implements CrawlConstants } } $data['ELAPSED_TIME'] = number_format( - L\changeInMicrotime($start_time),6); + L\changeInMicrotime($start_time), 6); if ($view == 'api') { $data['ELEMENT'] = 'search'; } @@ -400,8 +400,6 @@ class SearchController extends Controller implements CrawlConstants $activity = $_REQUEST['a']; if (isset($_REQUEST['arg'])) { $arg = $this->clean($_REQUEST['arg'], "string"); - } else if ($activity != "trending") { - $activity = "query"; } } if (isset($_SESSION['USER_ID'])) { @@ -601,7 +599,6 @@ class SearchController extends Controller implements CrawlConstants $data['TRENDING'] = true; $data['ACTIVITY_METHOD'] = 'trending'; $data['ACTIVITY_CONTROLLER'] = 'search'; - $data['NO_QUERY'] = true; $data['MORE_PAGE'] = 0; $data['CATEGORY'] = 'news'; $data['CATEGORY_TYPE'] = 'feed'; @@ -621,6 +618,7 @@ class SearchController extends Controller implements CrawlConstants $source_model->getSubsearchName($data['CATEGORY'], $data['LOCALE_TAG']) : false; $data['MEDIA_CATEGORIES'] = []; + $data['QUERY'] = "trending:" . $data['CATEGORY']; $logged_in = isset($data["ADMIN"]) && $data["ADMIN"]; $token_query = ($logged_in && isset($data[C\CSRF_TOKEN])) ? C\CSRF_TOKEN . "=" . $data[C\CSRF_TOKEN] . "&": "?"; @@ -650,8 +648,16 @@ class SearchController extends Controller implements CrawlConstants $dates = [ C\ONE_HOUR => 'i', C\ONE_DAY => 'H', C\ONE_WEEK => 'D', C\ONE_MONTH => 'W', C\ONE_YEAR => 'm' ]; - $date_format = (empty($dates[$period])) ? 'r' : $dates[$period]; + $query_dates = [ C\ONE_HOUR => 'h', C\ONE_DAY => 'd', + C\ONE_WEEK => 'w', C\ONE_MONTH => 'm', C\ONE_YEAR => 'y' + ]; + $date_format = (empty($dates[$period])) ? 'H' : $dates[$period]; + $query_date = (empty($query_dates[$period])) ? + 'D' : $query_dates[$period]; $graph_keys = []; + $data['QUERY'] = "chart:" . $data['CATEGORY'] . ":". + $query_date . ":"; + $colon = ""; foreach ($terms as $term) { $term = $this->clean(urldecode($term), "string"); $data['TERMS'][] = $term; @@ -660,6 +666,9 @@ class SearchController extends Controller implements CrawlConstants L\getLocaleTag(), true); $graph_keys = array_merge($graph_keys, array_keys($graph)); $graphs[] = $graph; + $data['QUERY'] .= $colon . preg_replace("/\s+/", "_", + $term); + $colon = ":"; } $graph_keys = array_unique($graph_keys); sort($graph_keys); @@ -1428,6 +1437,30 @@ EOD; $out_query = ""; $activity = $a_activity; $arg = mb_substr($query_parts[$i], strlen("$a_activity:")); + if ($activity == "trending") { + $_REQUEST['category'] = $arg; + } + if ($activity == "chart") { + $activity = "trending"; + $query_dates = [ 'h' => C\ONE_HOUR, 'd' => C\ONE_DAY, + 'w' => C\ONE_WEEK, 'm' => C\ONE_MONTH, + 'y' => C\ONE_YEAR]; + $chart_parts = explode(":", $arg); + $arg = "chart"; + $_REQUEST['category'] = $chart_parts[0]; + $_REQUEST["period"] = (isset($query_dates[ + $chart_parts[1]])) ? $query_dates[$chart_parts[1]] : + C\ONE_DAY; + $terms = []; + if (!empty($chart_parts[2])) { + $pre_terms = array_slice($chart_parts, 2); + foreach ($pre_terms as $pre_term) { + $terms[preg_replace("/\_/u", " ", + $pre_term)] = true; + } + } + $_REQUEST['term'] = $terms; + } continue; } } diff --git a/src/controllers/components/CrawlComponent.php b/src/controllers/components/CrawlComponent.php index b51cbe7ed..eeb61a0aa 100644 --- a/src/controllers/components/CrawlComponent.php +++ b/src/controllers/components/CrawlComponent.php @@ -2476,17 +2476,22 @@ class CrawlComponent extends Component implements CrawlConstants tl('crawl_component_sources_indexes')]; foreach ($search_lists as $item) { $data["SEARCH_LISTS"]["i:" . $item["CRAWL_TIME"]] = - $item["DESCRIPTION"]; + tl('crawl_component_index') . ":" .$item["DESCRIPTION"]; } if (isset($_SESSION['USER_ID'])) { $user = $_SESSION['USER_ID']; } else { $user = L\remoteAddress(); } - $search_lists= $crawl_model->getMixList($user); + $search_lists = $crawl_model->getMixList($user); foreach ($search_lists as $item) { $data["SEARCH_LISTS"]["m:".$item["TIMESTAMP"]] = - $item["NAME"]; + tl('crawl_component_mix') . ":" .$item["NAME"]; + } + $trend_lists = $source_model->getMediaCategories([], "trending_value"); + foreach ($trend_lists as $item) { + $data["SEARCH_LISTS"]["t:".$item["TIMESTAMP"]] = + tl('crawl_component_trends') . ":" .$item["NAME"]; } $n = C\NUM_RESULTS_PER_PAGE; $data['PER_PAGE'] = [$n => $n, 2*$n => 2*$n, 5*$n=> 5*$n, diff --git a/src/css/search.css b/src/css/search.css index f961801b9..8cc3b32a7 100755 --- a/src/css/search.css +++ b/src/css/search.css @@ -761,10 +761,10 @@ body.mobile z-index:50; } /* controls */ -a.anchor-button { +.anchor-button { background-color: #AAA; border-radius: 5px; - color: #FFF !important; + color: #EEE !important; cursor: pointer; display: inline-block; font-weight: bold; @@ -773,6 +773,11 @@ a.anchor-button { text-align: center; text-decoration: none; } +.anchor-button:hover { + background-color: #888; + color: #FFF !important; + text-decoration: underline; +} /* ComponentView styles */ diff --git a/src/locale/ar/configure.ini b/src/locale/ar/configure.ini index ceb933d29..26dc59a67 100755 --- a/src/locale/ar/configure.ini +++ b/src/locale/ar/configure.ini @@ -467,6 +467,9 @@ crawl_component_one_week = "أسبوع واحد" crawl_component_one_month = "شهر واحد" crawl_component_one_year = "سنة واحدة" crawl_component_sources_indexes = "مؤشر/ميكس للاستخدام" +crawl_component_index = "" +crawl_component_mix = "" +crawl_component_trends = "" crawl_component_no_source_type = "نوع المصدر لا يقع!" crawl_component_missing_type = "يجب تعيين نوع الوسائط!" crawl_component_invalid_url = "URL غير صالح!" @@ -881,6 +884,7 @@ groupoptions_element_userrss = "المستخدم: %s RSS" groupoptions_element_myfeeds = "بي إس" ; ; AdminbarElement.php +adminbar_element_skip_nav = "" adminbar_element_admin = "المشرف" ; ; ManagecreditsElement.php @@ -909,6 +913,7 @@ social_component_join_group_fee = "الانضمام إلى مناقشة مجمو group_element_auto_logout_one_minute = "لصناعة السيارات في الخروج في دقيقة واحدة!!" ; ; SearchbarElement.php +searchbar_element_skip_nav = "" searchbar_element_title = "Yioop - PHP محرك البحث" searchbar_element_input_label = "أدخل حيث كنت ترغب في البحث في الإنترنت" searchbar_element_input_placeholder = "اكتب ما تجد" @@ -1137,6 +1142,7 @@ editlocales_element_no_matching = "لا مطابقة السلاسل اليسار editlocales_element_save = "حفظ" ; ; GroupbarElement.php +groupbar_element_skip_nav = "" groupbar_element_page_list = "صفحة قائمة" groupbar_element_page_thread = " %s صفحة %s مناقشة جماعية" groupbar_element_groupfeed = "%s تغذية" diff --git a/src/locale/ar/statistics.txt b/src/locale/ar/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/ar/statistics.txt +++ b/src/locale/ar/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/bn/configure.ini b/src/locale/bn/configure.ini index 73c3b1677..56e427d7d 100755 --- a/src/locale/bn/configure.ini +++ b/src/locale/bn/configure.ini @@ -467,6 +467,9 @@ crawl_component_one_week = "এক সপ্তাহ" crawl_component_one_month = "এক মাস" crawl_component_one_year = "এক বছর" crawl_component_sources_indexes = "সূচী/মিশ্রণ ব্যবহার করতে" +crawl_component_index = "" +crawl_component_mix = "" +crawl_component_trends = "" crawl_component_no_source_type = "টাইপ এর উৎস সেট না!" crawl_component_missing_type = "আবশ্যক সেট মিডিয়া টাইপ!" crawl_component_invalid_url = "অবৈধ URL!" @@ -881,6 +884,7 @@ groupoptions_element_userrss = "ব্যবহারকারী: %s আরএ groupoptions_element_myfeeds = "আমার ফিড" ; ; AdminbarElement.php +adminbar_element_skip_nav = "" adminbar_element_admin = "অ্যাডমিন" ; ; ManagecreditsElement.php @@ -909,6 +913,7 @@ social_component_join_group_fee = "যোগদান, আলোচনা, গ group_element_auto_logout_one_minute = "অটো-লগআউট এক মিনিটের মধ্যে!!" ; ; SearchbarElement.php +searchbar_element_skip_nav = "" searchbar_element_title = "Yioop - পিএইচপি সার্চ ইঞ্জিন" searchbar_element_input_label = "প্রবেশ পদ আপনি চাই জন্য ওয়েব অনুসন্ধান করুন" searchbar_element_input_placeholder = "কি টাইপ খুঁজে পেতে" @@ -1137,6 +1142,7 @@ editlocales_element_no_matching = "কোন মেলা স্ট্রিং editlocales_element_save = "সংরক্ষণ করুন" ; ; GroupbarElement.php +groupbar_element_skip_nav = "" groupbar_element_page_list = "পৃষ্ঠা তালিকা" groupbar_element_page_thread = " %s পৃষ্ঠার এ %s গ্রুপ আলোচনা" groupbar_element_groupfeed = "%s ফিড" diff --git a/src/locale/bn/statistics.txt b/src/locale/bn/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/bn/statistics.txt +++ b/src/locale/bn/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/de/configure.ini b/src/locale/de/configure.ini index e88d70ce0..9f5896be8 100755 --- a/src/locale/de/configure.ini +++ b/src/locale/de/configure.ini @@ -467,6 +467,9 @@ crawl_component_one_week = "Eine Woche" crawl_component_one_month = "Einen Monat" crawl_component_one_year = "Ein Jahr" crawl_component_sources_indexes = "Index/Mix zu Verwenden" +crawl_component_index = "" +crawl_component_mix = "" +crawl_component_trends = "" crawl_component_no_source_type = "Art der Quelle Nicht Gesetzt!" crawl_component_missing_type = "Muss set media type!" crawl_component_invalid_url = "Ungültige URL!" @@ -881,6 +884,7 @@ groupoptions_element_userrss = "Benutzer: %s-RSS" groupoptions_element_myfeeds = "Meine Feeds" ; ; AdminbarElement.php +adminbar_element_skip_nav = "" adminbar_element_admin = "Admin" ; ; ManagecreditsElement.php @@ -909,6 +913,7 @@ social_component_join_group_fee = "Join-Diskussion Gruppe Gebühr " group_element_auto_logout_one_minute = "Auto-logout-in Einer Minute!!" ; ; SearchbarElement.php +searchbar_element_skip_nav = "" searchbar_element_title = "Yioop - PHP-Suchmaschine" searchbar_element_input_label = "Geben Sie die Begriffe, die Sie möchten, suchen Sie im Internet nach" searchbar_element_input_placeholder = "Typ was zu finden" @@ -1137,6 +1142,7 @@ editlocales_element_no_matching = "Keine Übereinstimmenden Zeichenfolgen Li editlocales_element_save = "Speichern" ; ; GroupbarElement.php +groupbar_element_skip_nav = "" groupbar_element_page_list = "Seite Liste" groupbar_element_page_thread = " %s Seite %s Gruppe Diskussion" groupbar_element_groupfeed = "%s-Feed" diff --git a/src/locale/de/statistics.txt b/src/locale/de/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/de/statistics.txt +++ b/src/locale/de/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/en_US/configure.ini b/src/locale/en_US/configure.ini index 27e93c695..158e5150b 100644 --- a/src/locale/en_US/configure.ini +++ b/src/locale/en_US/configure.ini @@ -467,6 +467,9 @@ crawl_component_one_week = "One Week" crawl_component_one_month = "One Month" crawl_component_one_year = "One Year" crawl_component_sources_indexes = "Index/Mix to Use" +crawl_component_index = "Index" +crawl_component_mix = "Mix" +crawl_component_trends = "Trends" crawl_component_no_source_type = "Type of Source Not Set!" crawl_component_missing_type = "Must set media type!" crawl_component_invalid_url = "Invalid URL!" @@ -881,6 +884,7 @@ groupoptions_element_userrss = "User: %s RSS" groupoptions_element_myfeeds = "My Feeds" ; ; AdminbarElement.php +adminbar_element_skip_nav = "Skip Navigation" adminbar_element_admin = "Admin" ; ; ManagecreditsElement.php @@ -909,6 +913,7 @@ social_component_join_group_fee = "Join discussion group fee " group_element_auto_logout_one_minute = "Auto-logout in One Minute!!" ; ; SearchbarElement.php +searchbar_element_skip_nav = "Skip Navigation" searchbar_element_title = "Yioop - PHP Search Engine" searchbar_element_input_label = "Enter the terms you would like to search the web for" searchbar_element_input_placeholder = "Type what to find" @@ -1137,6 +1142,7 @@ editlocales_element_no_matching = "No Matching Strings Left To Translate!" editlocales_element_save = "Save" ; ; GroupbarElement.php +groupbar_element_skip_nav = "Skip Navigation" groupbar_element_page_list = "Page List" groupbar_element_page_thread = " %s Page at %s Group Discussion" groupbar_element_groupfeed = "%s Feed" diff --git a/src/locale/es/configure.ini b/src/locale/es/configure.ini index b6d0c6dd8..f0e53a95d 100755 --- a/src/locale/es/configure.ini +++ b/src/locale/es/configure.ini @@ -467,6 +467,9 @@ crawl_component_one_week = "Una Semana" crawl_component_one_month = "Un Mes" crawl_component_one_year = "Un Año" crawl_component_sources_indexes = "Índice/Mezcla a Utilizar" +crawl_component_index = "" +crawl_component_mix = "" +crawl_component_trends = "" crawl_component_no_source_type = "Tipo de Fuente No se Encuentra!" crawl_component_missing_type = "Debe establecer el tipo de medios!" crawl_component_invalid_url = "Dirección URL no válida!" @@ -881,6 +884,7 @@ groupoptions_element_userrss = "Usuario: %s RSS" groupoptions_element_myfeeds = "Mis Feeds" ; ; AdminbarElement.php +adminbar_element_skip_nav = "" adminbar_element_admin = "Admin" ; ; ManagecreditsElement.php @@ -909,6 +913,7 @@ social_component_join_group_fee = "Únete a grupo de discusión de l group_element_auto_logout_one_minute = "Auto-logout en Un Minuto!!" ; ; SearchbarElement.php +searchbar_element_skip_nav = "" searchbar_element_title = "Yioop - PHP Motor de Búsqueda" searchbar_element_input_label = "Ingrese las palabras que desea buscar en la web para" searchbar_element_input_placeholder = "Escriba lo que encuentre" @@ -1137,6 +1142,7 @@ editlocales_element_no_matching = "No Hay Coincidencia De Cadenas De Izquierda A editlocales_element_save = "Guardar" ; ; GroupbarElement.php +groupbar_element_skip_nav = "" groupbar_element_page_list = "Página De La Lista" groupbar_element_page_thread = " %s Página %s Discusión de Grupo" groupbar_element_groupfeed = "%s de Alimentación" diff --git a/src/locale/es/statistics.txt b/src/locale/es/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/es/statistics.txt +++ b/src/locale/es/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/fa/configure.ini b/src/locale/fa/configure.ini index 6a7e41792..c67befaad 100755 --- a/src/locale/fa/configure.ini +++ b/src/locale/fa/configure.ini @@ -467,6 +467,9 @@ crawl_component_one_week = "یک هفته" crawl_component_one_month = "یک ماه" crawl_component_one_year = "یک سال" crawl_component_sources_indexes = "نمایه/ترکیب مورد استفاده" +crawl_component_index = "" +crawl_component_mix = "" +crawl_component_trends = "" crawl_component_no_source_type = "نوع منبع تنظیم نشده!" crawl_component_missing_type = "باید نوع رسانه!" crawl_component_invalid_url = "URL نامعتبر!" @@ -881,6 +884,7 @@ groupoptions_element_userrss = "کاربر: %s RSS" groupoptions_element_myfeeds = "من فید" ; ; AdminbarElement.php +adminbar_element_skip_nav = "" adminbar_element_admin = "Admin" ; ; ManagecreditsElement.php @@ -909,6 +913,7 @@ social_component_join_group_fee = "پیوستن به گروه بحث هزینه group_element_auto_logout_one_minute = "Auto-logout در یک دقیقه!!" ; ; SearchbarElement.php +searchbar_element_skip_nav = "" searchbar_element_title = "Yioop - PHP Search Engine" searchbar_element_input_label = "را وارد کنید نظر شما می خواهم برای جستجو در وب برای" searchbar_element_input_placeholder = "از نوع آنچه که برای پیدا کردن" @@ -1137,6 +1142,7 @@ editlocales_element_no_matching = "هیچ تطبیق رشته ها از چپ ب editlocales_element_save = "صرفه جویی در" ; ; GroupbarElement.php +groupbar_element_skip_nav = "" groupbar_element_page_list = "صفحه فهرست" groupbar_element_page_thread = " %s صفحه %s بحث گروهی" groupbar_element_groupfeed = "%s خوراک" diff --git a/src/locale/fa/statistics.txt b/src/locale/fa/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/fa/statistics.txt +++ b/src/locale/fa/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/fr_FR/configure.ini b/src/locale/fr_FR/configure.ini index a51b343a0..af1d9978e 100755 --- a/src/locale/fr_FR/configure.ini +++ b/src/locale/fr_FR/configure.ini @@ -467,6 +467,9 @@ crawl_component_one_week = "Une semaine" crawl_component_one_month = "Un mois" crawl_component_one_year = "Un an" crawl_component_sources_indexes = "Index/Mélange à utiliser" +crawl_component_index = "" +crawl_component_mix = "" +crawl_component_trends = "" crawl_component_no_source_type = "Type de source non réglé!" crawl_component_missing_type = "Devez définir le type de média!" crawl_component_invalid_url = "URL invalide!" @@ -881,6 +884,7 @@ groupoptions_element_userrss = "Utilisateur: %s RSS" groupoptions_element_myfeeds = "Mes flux" ; ; AdminbarElement.php +adminbar_element_skip_nav = "" adminbar_element_admin = "Admin" ; ; ManagecreditsElement.php @@ -909,6 +913,7 @@ social_component_join_group_fee = "Frais pour se joindre au groupe de discussion group_element_auto_logout_one_minute = "Déconnexion automatique en Une Minute!!" ; ; SearchbarElement.php +searchbar_element_skip_nav = "" searchbar_element_title = "Yioop - PHP Moteur de Recherche" searchbar_element_input_label = "Entrez les termes que vous souhaitez rechercher sur le web pour" searchbar_element_input_placeholder = "Tapez ce que vous voulez trouver" @@ -1137,6 +1142,7 @@ editlocales_element_no_matching = "L'absence de correspondance Des cha&icir editlocales_element_save = "Enregistrer" ; ; GroupbarElement.php +groupbar_element_skip_nav = "" groupbar_element_page_list = "La page liste" groupbar_element_page_thread = " %s page %s groupe de discussion" groupbar_element_groupfeed = "%s alimentation" diff --git a/src/locale/fr_FR/statistics.txt b/src/locale/fr_FR/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/fr_FR/statistics.txt +++ b/src/locale/fr_FR/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/he/configure.ini b/src/locale/he/configure.ini index def83fc1e..3c36ce7da 100755 --- a/src/locale/he/configure.ini +++ b/src/locale/he/configure.ini @@ -467,6 +467,9 @@ crawl_component_one_week = "שבוע" crawl_component_one_month = "חודש אחד" crawl_component_one_year = "שנה אחת" crawl_component_sources_indexes = "מדד/לערבב להשתמש" +crawl_component_index = "" +crawl_component_mix = "" +crawl_component_trends = "" crawl_component_no_source_type = "סוג של מקור לא מוגדר!" crawl_component_missing_type = "חייבים להגדיר את סוג המדיה!" crawl_component_invalid_url = "כתובת לא תקפה!" @@ -881,6 +884,7 @@ groupoptions_element_userrss = "משתמש: %s RSS" groupoptions_element_myfeeds = "את הזנות" ; ; AdminbarElement.php +adminbar_element_skip_nav = "" adminbar_element_admin = "Admin" ; ; ManagecreditsElement.php @@ -909,6 +913,7 @@ social_component_join_group_fee = "הצטרפו לקבוצת הדיון תשלו group_element_auto_logout_one_minute = "Auto-ניתוק בתוך דקה אחת!!" ; ; SearchbarElement.php +searchbar_element_skip_nav = "" searchbar_element_title = "Yioop - PHP מנוע חיפוש" searchbar_element_input_label = "הזן את תנאי אתה רוצה לחפש באינטרנט" searchbar_element_input_placeholder = "הקלד את מה למצוא" @@ -1137,6 +1142,7 @@ editlocales_element_no_matching = "לא התאמת מחרוזות שמאל לת editlocales_element_save = "להציל" ; ; GroupbarElement.php +groupbar_element_skip_nav = "" groupbar_element_page_list = "בדף הרשימה." groupbar_element_page_thread = " %s עמוד %s קבוצת דיון" groupbar_element_groupfeed = "%s להאכיל" diff --git a/src/locale/he/statistics.txt b/src/locale/he/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/he/statistics.txt +++ b/src/locale/he/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/hi/configure.ini b/src/locale/hi/configure.ini index f398ef141..8e3f712bd 100755 --- a/src/locale/hi/configure.ini +++ b/src/locale/hi/configure.ini @@ -467,6 +467,9 @@ crawl_component_one_week = "एक सप्ताह" crawl_component_one_month = "एक महीने" crawl_component_one_year = "एक वर्ष" crawl_component_sources_indexes = "सूचकांक/मिश्रण का उपयोग करने के लिए" +crawl_component_index = "" +crawl_component_mix = "" +crawl_component_trends = "" crawl_component_no_source_type = "स्रोत के प्रकार सेट नहीं!" crawl_component_missing_type = "सेट करना होगा मीडिया प्रकार!" crawl_component_invalid_url = "अमान्य URL!" @@ -881,6 +884,7 @@ groupoptions_element_userrss = "उपयोगकर्ता: %s आरएस groupoptions_element_myfeeds = "मेरे फ़ीड" ; ; AdminbarElement.php +adminbar_element_skip_nav = "" adminbar_element_admin = "Admin" ; ; ManagecreditsElement.php @@ -909,6 +913,7 @@ social_component_join_group_fee = "चर्चा समूह में शा group_element_auto_logout_one_minute = "ऑटो लॉगआउट एक मिनट में!!" ; ; SearchbarElement.php +searchbar_element_skip_nav = "" searchbar_element_title = "Yioop - PHP खोज इंजन" searchbar_element_input_label = "दर्ज मामले के लिए चाहते हैं के लिए वेब खोज" searchbar_element_input_placeholder = "प्रकार क्या खोजने के लिए" @@ -1137,6 +1142,7 @@ editlocales_element_no_matching = "कोई मिलान तार छोड editlocales_element_save = "बचाने के लिए" ; ; GroupbarElement.php +groupbar_element_skip_nav = "" groupbar_element_page_list = "पृष्ठ सूची" groupbar_element_page_thread = " %s पृष्ठ पर %s समूह चर्चा" groupbar_element_groupfeed = "%s फ़ीड" diff --git a/src/locale/hi/statistics.txt b/src/locale/hi/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/hi/statistics.txt +++ b/src/locale/hi/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/id/configure.ini b/src/locale/id/configure.ini index 4f850ce2e..aa896807a 100755 --- a/src/locale/id/configure.ini +++ b/src/locale/id/configure.ini @@ -467,6 +467,9 @@ crawl_component_one_week = "Satu Minggu" crawl_component_one_month = "Satu Bulan" crawl_component_one_year = "Satu Tahun" crawl_component_sources_indexes = "Indeks/Campuran untuk Menggunakan" +crawl_component_index = "" +crawl_component_mix = "" +crawl_component_trends = "" crawl_component_no_source_type = "Jenis Sumber Tidak Diatur!" crawl_component_missing_type = "Harus menetapkan jenis media!" crawl_component_invalid_url = "URL tidak valid!" @@ -881,6 +884,7 @@ groupoptions_element_userrss = "Pengguna: %s RSS" groupoptions_element_myfeeds = "Feed Saya" ; ; AdminbarElement.php +adminbar_element_skip_nav = "" adminbar_element_admin = "Admin" ; ; ManagecreditsElement.php @@ -909,6 +913,7 @@ social_component_join_group_fee = "Bergabung dengan diskusi kelompok biaya " group_element_auto_logout_one_minute = "Auto-logout dalam Satu Menit!!" ; ; SearchbarElement.php +searchbar_element_skip_nav = "" searchbar_element_title = "Yioop - Mesin Pencari PHP" searchbar_element_input_label = "Masukkan istilah yang anda ingin mencari web untuk" searchbar_element_input_placeholder = "Jenis apa yang akan menemukan" @@ -1137,6 +1142,7 @@ editlocales_element_no_matching = "Tidak Ada Pencocokan String Kiri Untuk Menerj editlocales_element_save = "Simpan" ; ; GroupbarElement.php +groupbar_element_skip_nav = "" groupbar_element_page_list = "Halaman Daftar" groupbar_element_page_thread = " %s Halaman %s Diskusi Kelompok" groupbar_element_groupfeed = "%s Pakan" diff --git a/src/locale/id/statistics.txt b/src/locale/id/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/id/statistics.txt +++ b/src/locale/id/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/it/configure.ini b/src/locale/it/configure.ini index 174bbb31b..17a58d8fe 100755 --- a/src/locale/it/configure.ini +++ b/src/locale/it/configure.ini @@ -467,6 +467,9 @@ crawl_component_one_week = "Una Settimana" crawl_component_one_month = "Un Mese" crawl_component_one_year = "Un Anno" crawl_component_sources_indexes = "Indice/Mix da Usare" +crawl_component_index = "" +crawl_component_mix = "" +crawl_component_trends = "" crawl_component_no_source_type = "Tipo di Fonte e Non Imposta!" crawl_component_missing_type = "È necessario impostare il tipo di supporto!" crawl_component_invalid_url = "URL non valida!" @@ -881,6 +884,7 @@ groupoptions_element_userrss = "Utente: %s RSS" groupoptions_element_myfeeds = "I Miei Feed" ; ; AdminbarElement.php +adminbar_element_skip_nav = "" adminbar_element_admin = "Admin" ; ; ManagecreditsElement.php @@ -909,6 +913,7 @@ social_component_join_group_fee = "Unirsi a un gruppo di discussione tassa " group_element_auto_logout_one_minute = "Auto-logout in Un Minuto!!!" ; ; SearchbarElement.php +searchbar_element_skip_nav = "" searchbar_element_title = "Yioop - PHP Motore di Ricerca" searchbar_element_input_label = "Inserisci i termini di ricerca web per" searchbar_element_input_placeholder = "Tipo quello di trovare" @@ -1137,6 +1142,7 @@ editlocales_element_no_matching = "Nessun Stringhe Sinistra A Tradurre!" editlocales_element_save = "Salva" ; ; GroupbarElement.php +groupbar_element_skip_nav = "" groupbar_element_page_list = "Pagina Elenco" groupbar_element_page_thread = " %s Pagina %s di Discussione di Gruppo" groupbar_element_groupfeed = "%s Alimentazione" diff --git a/src/locale/it/statistics.txt b/src/locale/it/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/it/statistics.txt +++ b/src/locale/it/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/ja/configure.ini b/src/locale/ja/configure.ini index d1af591e6..1ccd74c7f 100755 --- a/src/locale/ja/configure.ini +++ b/src/locale/ja/configure.ini @@ -467,6 +467,9 @@ crawl_component_one_week = "一週間" crawl_component_one_month = "一ヶ月" crawl_component_one_year = "一年" crawl_component_sources_indexes = "デスクトップミックスの使用" +crawl_component_index = "" +crawl_component_mix = "" +crawl_component_trends = "" crawl_component_no_source_type = "タイプのソースはセットです！" crawl_component_missing_type = "設定によりメディアタイプ！" crawl_component_invalid_url = "無効なURL!" @@ -881,6 +884,7 @@ groupoptions_element_userrss = "ユーザー数：%s-RSS" groupoptions_element_myfeeds = "私のフィード" ; ; AdminbarElement.php +adminbar_element_skip_nav = "" adminbar_element_admin = "Admin" ; ; ManagecreditsElement.php @@ -909,6 +913,7 @@ social_component_join_group_fee = "参加ディスカッショングループ料 group_element_auto_logout_one_minute = "オート用一分！！" ; ; SearchbarElement.php +searchbar_element_skip_nav = "" searchbar_element_title = "Yioop-PHPの検索エンジン" searchbar_element_input_label = "入力したい検索のウェブ" searchbar_element_input_placeholder = "タイプかを探" @@ -1137,6 +1142,7 @@ editlocales_element_no_matching = "一致する文字列を残す!" editlocales_element_save = "保存" ; ; GroupbarElement.php +groupbar_element_skip_nav = "" groupbar_element_page_list = "ページのリスト" groupbar_element_page_thread = " %sページ%sグループ討論" groupbar_element_groupfeed = "%s飼料" diff --git a/src/locale/ja/statistics.txt b/src/locale/ja/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/ja/statistics.txt +++ b/src/locale/ja/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/kn/configure.ini b/src/locale/kn/configure.ini index 5f73c056b..a38e40ce0 100755 --- a/src/locale/kn/configure.ini +++ b/src/locale/kn/configure.ini @@ -467,6 +467,9 @@ crawl_component_one_week = "ಒಂದು ವಾರ" crawl_component_one_month = "ಒಂದು ತಿಂಗಳ" crawl_component_one_year = "ಒಂದು ವರ್ಷದ" crawl_component_sources_indexes = "ಸೂಚ್ಯಂಕ/ಮಿಶ್ರಣ ಬಳಸಲು" +crawl_component_index = "" +crawl_component_mix = "" +crawl_component_trends = "" crawl_component_no_source_type = "ರೀತಿಯ ಮೂಲ ಸೆಟ್ ಇಲ್ಲ!" crawl_component_missing_type = "ಸೆಟ್ ಮಾಡಬೇಕು ಮಾಧ್ಯಮ ರೀತಿಯ!" crawl_component_invalid_url = "ಅಮಾನ್ಯ URL!" @@ -881,6 +884,7 @@ groupoptions_element_userrss = "ಬಳಕೆದಾರ: %s ಮೇ" groupoptions_element_myfeeds = "ನನ್ನ ಫೀಡ್ಗಳನ್ನು" ; ; AdminbarElement.php +adminbar_element_skip_nav = "" adminbar_element_admin = "ನಿರ್ವಹಣೆ" ; ; ManagecreditsElement.php @@ -909,6 +913,7 @@ social_component_join_group_fee = "ಸೇರಲು ಚರ್ಚೆ ಗುಂಪ group_element_auto_logout_one_minute = "ಆಟೋ-ಲಾಗ್ಔಟ್ ಒಂದು ನಿಮಿಷ!!" ; ; SearchbarElement.php +searchbar_element_skip_nav = "" searchbar_element_title = "Yioop - ಪಿಎಚ್ಪಿ ಹುಡುಕಾಟ ಎಂಜಿನ್" searchbar_element_input_label = "ನಮೂದಿಸಿ ನಿಯಮಗಳು you would like to search ವೆಬ್" searchbar_element_input_placeholder = "ಕೌಟುಂಬಿಕತೆ ಏನು ಕಂಡುಹಿಡಿಯಲು" @@ -1137,6 +1142,7 @@ editlocales_element_no_matching = "ಯಾವುದೇ ಹೊಂದಿಕೆ ತ editlocales_element_save = "ಉಳಿಸಲು" ; ; GroupbarElement.php +groupbar_element_skip_nav = "" groupbar_element_page_list = "ಪುಟ ಪಟ್ಟಿ" groupbar_element_page_thread = " %s ಪುಟ ನಲ್ಲಿ %s ಗುಂಪು ಚರ್ಚೆ" groupbar_element_groupfeed = "%s ಫೀಡ್" diff --git a/src/locale/kn/statistics.txt b/src/locale/kn/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/kn/statistics.txt +++ b/src/locale/kn/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/ko/configure.ini b/src/locale/ko/configure.ini index b211c541b..f20586750 100755 --- a/src/locale/ko/configure.ini +++ b/src/locale/ko/configure.ini @@ -467,6 +467,9 @@ crawl_component_one_week = "일주일" crawl_component_one_month = "한 달" crawl_component_one_year = "One Year" crawl_component_sources_indexes = "Index/혼합 사용" +crawl_component_index = "" +crawl_component_mix = "" +crawl_component_trends = "" crawl_component_no_source_type = "원본의 유형을 설정하지 않!" crawl_component_missing_type = "미디어 유형을 설정해야 합니다!" crawl_component_invalid_url = "잘못된 URL 을!" @@ -881,6 +884,7 @@ groupoptions_element_userrss = "사용자:%sRSS" groupoptions_element_myfeeds = "내 피드" ; ; AdminbarElement.php +adminbar_element_skip_nav = "" adminbar_element_admin = "Admin" ; ; ManagecreditsElement.php @@ -909,6 +913,7 @@ social_component_join_group_fee = "에 가입하는 요금 " group_element_auto_logout_one_minute = "자동 로그아웃 한 분입니다!!" ; ; SearchbarElement.php +searchbar_element_skip_nav = "" searchbar_element_title = "Yioop-검색 엔진 PHP" searchbar_element_input_label = "입력어를하고 싶은 웹 검색" searchbar_element_input_placeholder = "형을 찾기 위해 무엇" @@ -1137,6 +1142,7 @@ editlocales_element_no_matching = "일치하는 문자열을 왼쪽 번역!" editlocales_element_save = "저장" ; ; GroupbarElement.php +groupbar_element_skip_nav = "" groupbar_element_page_list = "페이지 목록" groupbar_element_page_thread = " %s 페이지에 %s 그룹 토론" groupbar_element_groupfeed = "%s 피드" diff --git a/src/locale/ko/statistics.txt b/src/locale/ko/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/ko/statistics.txt +++ b/src/locale/ko/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/nl/configure.ini b/src/locale/nl/configure.ini index 66cb5f11c..47ba7804a 100644 --- a/src/locale/nl/configure.ini +++ b/src/locale/nl/configure.ini @@ -467,6 +467,9 @@ crawl_component_one_week = "Een Week" crawl_component_one_month = "Een Maand" crawl_component_one_year = "Één Jaar" crawl_component_sources_indexes = "Index / Mix te gebruiken" +crawl_component_index = "" +crawl_component_mix = "" +crawl_component_trends = "" crawl_component_no_source_type = "Type Bron onbekend!" crawl_component_missing_type = "Moet mediatype ingesteld!" crawl_component_invalid_url = "Ongeldige URL!" @@ -881,6 +884,7 @@ groupoptions_element_userrss = "Gebruiker: %s RSS" groupoptions_element_myfeeds = "Mijn Feeds" ; ; AdminbarElement.php +adminbar_element_skip_nav = "" adminbar_element_admin = "Admin" ; ; ManagecreditsElement.php @@ -909,6 +913,7 @@ social_component_join_group_fee = "Deelnemen aan de discussie groep vergoeding " group_element_auto_logout_one_minute = "Auto-logout in Één Minuut!!" ; ; SearchbarElement.php +searchbar_element_skip_nav = "" searchbar_element_title = "Yioop - PHP zoekmachine" searchbar_element_input_label = "Voer de zoektermen die u wilt zoeken op het web voor" searchbar_element_input_placeholder = "Type wat er te vinden is" @@ -1137,6 +1142,7 @@ editlocales_element_no_matching = "Geen Matching Strings Left To Translate!" editlocales_element_save = "Opslaan" ; ; GroupbarElement.php +groupbar_element_skip_nav = "" groupbar_element_page_list = "Pagina Lijst" groupbar_element_page_thread = " %s Pagina op %s-Groep Discussie" groupbar_element_groupfeed = "%s Feed" diff --git a/src/locale/nl/statistics.txt b/src/locale/nl/statistics.txt index eedae9b06..a88e2a194 100644 --- a/src/locale/nl/statistics.txt +++ b/src/locale/nl/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/pl/configure.ini b/src/locale/pl/configure.ini index 45f13df34..d97e34b39 100755 --- a/src/locale/pl/configure.ini +++ b/src/locale/pl/configure.ini @@ -467,6 +467,9 @@ crawl_component_one_week = "Tydzień" crawl_component_one_month = "Jeden Miesiąc" crawl_component_one_year = "Jeden Rok" crawl_component_sources_indexes = "Indeks/mieszanka używać" +crawl_component_index = "" +crawl_component_mix = "" +crawl_component_trends = "" crawl_component_no_source_type = "Typ źródła nie jest zainstalowany!" crawl_component_missing_type = "Należy ustawić typ mediów!" crawl_component_invalid_url = "Nieprawidłowy adres URL!" @@ -881,6 +884,7 @@ groupoptions_element_userrss = "Użytkowników: %s PCC" groupoptions_element_myfeeds = "Moje Kanały" ; ; AdminbarElement.php +adminbar_element_skip_nav = "" adminbar_element_admin = "Admin" ; ; ManagecreditsElement.php @@ -909,6 +913,7 @@ social_component_join_group_fee = "Dołącz do grupie dyskusyjnej komisji " group_element_auto_logout_one_minute = "Auto-wyjście w jedną minutę!!" ; ; SearchbarElement.php +searchbar_element_skip_nav = "" searchbar_element_title = "Yioop - wyszukiwarki na PHP " searchbar_element_input_label = "Wpisz terminy do wyszukiwania w internecie" searchbar_element_input_placeholder = "Rodzaju tego, co znaleźć" @@ -1137,6 +1142,7 @@ editlocales_element_no_matching = "Nie Ma Odpowiednich Wierszy Lewej Tłumaczyć editlocales_element_save = "Zapisz" ; ; GroupbarElement.php +groupbar_element_skip_nav = "" groupbar_element_page_list = "Lista Stron " groupbar_element_page_thread = " %s strona %s w dyskusji grupowej" groupbar_element_groupfeed = "%s karmić" diff --git a/src/locale/pl/statistics.txt b/src/locale/pl/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/pl/statistics.txt +++ b/src/locale/pl/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/pt/configure.ini b/src/locale/pt/configure.ini index 12a575223..e71e21f48 100755 --- a/src/locale/pt/configure.ini +++ b/src/locale/pt/configure.ini @@ -467,6 +467,9 @@ crawl_component_one_week = "Uma Semana" crawl_component_one_month = "Um Mês" crawl_component_one_year = "Um Ano" crawl_component_sources_indexes = "Índice/Mix Usar" +crawl_component_index = "" +crawl_component_mix = "" +crawl_component_trends = "" crawl_component_no_source_type = "Tipo de Fonte Não Definido!" crawl_component_missing_type = "Deve definir o tipo de mídia!" crawl_component_invalid_url = "URL inválido!" @@ -881,6 +884,7 @@ groupoptions_element_userrss = "Usuário: %s RSS" groupoptions_element_myfeeds = "Meus Feeds" ; ; AdminbarElement.php +adminbar_element_skip_nav = "" adminbar_element_admin = "Admin" ; ; ManagecreditsElement.php @@ -909,6 +913,7 @@ social_component_join_group_fee = "Participe do grupo de discussão taxa d group_element_auto_logout_one_minute = "Logout automático em Um Minuto!!" ; ; SearchbarElement.php +searchbar_element_skip_nav = "" searchbar_element_title = "Yioop - PHP Motor de Busca" searchbar_element_input_label = "Digite os termos que você gostaria de pesquisar na web para" searchbar_element_input_placeholder = "Digite o que encontrar" @@ -1137,6 +1142,7 @@ editlocales_element_no_matching = "Nenhuma Correspondência De Cadeias De C editlocales_element_save = "Salvar" ; ; GroupbarElement.php +groupbar_element_skip_nav = "" groupbar_element_page_list = "Página Da Lista" groupbar_element_page_thread = " %s Página %s de Grupo de Discussão" groupbar_element_groupfeed = "%s Feed" diff --git a/src/locale/pt/statistics.txt b/src/locale/pt/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/pt/statistics.txt +++ b/src/locale/pt/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/ru/configure.ini b/src/locale/ru/configure.ini index 5496b09d8..dadc430bd 100755 --- a/src/locale/ru/configure.ini +++ b/src/locale/ru/configure.ini @@ -467,6 +467,9 @@ crawl_component_one_week = "Одну Неделю" crawl_component_one_month = "Один Месяц" crawl_component_one_year = "Один Год" crawl_component_sources_indexes = "Индекс/смесь использовать" +crawl_component_index = "" +crawl_component_mix = "" +crawl_component_trends = "" crawl_component_no_source_type = "Типа источник не установлен!" crawl_component_missing_type = "Необходимо установить тип медиа!" crawl_component_invalid_url = "Недопустимый URL-адрес!" @@ -881,6 +884,7 @@ groupoptions_element_userrss = "Пользователей: %s РСС" groupoptions_element_myfeeds = "Мои Каналы" ; ; AdminbarElement.php +adminbar_element_skip_nav = "" adminbar_element_admin = "Админ" ; ; ManagecreditsElement.php @@ -909,6 +913,7 @@ social_component_join_group_fee = "Присоединитесь к дискус group_element_auto_logout_one_minute = "Авто-выход в одну минуту!!" ; ; SearchbarElement.php +searchbar_element_skip_nav = "" searchbar_element_title = "Yioop - поисковых систем на PHP " searchbar_element_input_label = "Введите термины для поиска в интернете" searchbar_element_input_placeholder = "Типа того, что найти" @@ -1137,6 +1142,7 @@ editlocales_element_no_matching = "Нет Соответствующих Стр editlocales_element_save = "Сохранить" ; ; GroupbarElement.php +groupbar_element_skip_nav = "" groupbar_element_page_list = "Список Страниц " groupbar_element_page_thread = " %s страница %s в групповой дискуссии" groupbar_element_groupfeed = "%s кормить" diff --git a/src/locale/ru/statistics.txt b/src/locale/ru/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/ru/statistics.txt +++ b/src/locale/ru/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/te/configure.ini b/src/locale/te/configure.ini index 9e517d4a5..1422aec03 100644 --- a/src/locale/te/configure.ini +++ b/src/locale/te/configure.ini @@ -467,6 +467,9 @@ crawl_component_one_week = "ఒక వారం" crawl_component_one_month = "ఒక నెల" crawl_component_one_year = "ఒక సంవత్సరం" crawl_component_sources_indexes = "సూచిక/మిక్స్ ఉపయోగించడానికి" +crawl_component_index = "" +crawl_component_mix = "" +crawl_component_trends = "" crawl_component_no_source_type = "సోర్స్ టైపు ఇంకా సెట్ చేయలేదు!" crawl_component_missing_type = "మీడియా సెట్ టైప్ చేయాలి!" crawl_component_invalid_url = "చెల్లని యుఆర్ఎల్!" @@ -881,6 +884,7 @@ groupoptions_element_userrss = "వాడుకరి: %s RSS" groupoptions_element_myfeeds = "నా ఫీడ్లు" ; ; AdminbarElement.php +adminbar_element_skip_nav = "" adminbar_element_admin = "అడ్మిన్" ; ; ManagecreditsElement.php @@ -909,6 +913,7 @@ social_component_join_group_fee = "Join చర్చ గ్రూప్ రు group_element_auto_logout_one_minute = "ఆటో లాగ్అవుట్ లో ఒక నిమిషం!!" ; ; SearchbarElement.php +searchbar_element_skip_nav = "" searchbar_element_title = "Yioop - PHP శోధన ఇంజిన్" searchbar_element_input_label = "ఎంటర్ పరంగా you would like to search the web for" searchbar_element_input_placeholder = "రకం ఏమి కనుగొనేందుకు" @@ -1137,6 +1142,7 @@ editlocales_element_no_matching = "అనువదించడానికి editlocales_element_save = "సేవ్" ; ; GroupbarElement.php +groupbar_element_skip_nav = "" groupbar_element_page_list = "పేజీ జాబితా" groupbar_element_page_thread = " %s పేజీ వద్ద %s గ్రూప్ డిస్కషన్" groupbar_element_groupfeed = "%s ఫీడ్" diff --git a/src/locale/te/statistics.txt b/src/locale/te/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/te/statistics.txt +++ b/src/locale/te/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/th/configure.ini b/src/locale/th/configure.ini index fe6d7c638..390669f63 100755 --- a/src/locale/th/configure.ini +++ b/src/locale/th/configure.ini @@ -467,6 +467,9 @@ crawl_component_one_week = "หนึ่งสัปดาห์" crawl_component_one_month = "หนึ่งเดือน" crawl_component_one_year = "หนึ่งปี" crawl_component_sources_indexes = "ดัชนี/ผสมที่จะใช้" +crawl_component_index = "" +crawl_component_mix = "" +crawl_component_trends = "" crawl_component_no_source_type = "ชนิดของแหล่งข่าวไม่เปิด!" crawl_component_missing_type = "ต้องตั้งค่าชนิดของวัสดุพิมพ์!" crawl_component_invalid_url = "ตำแหน่ง URL ที่ไม่ถูกต้อง!" @@ -881,6 +884,7 @@ groupoptions_element_userrss = "ของผู้ใช้:ทั้งหม groupoptions_element_myfeeds = "แหล่งป้อนของฉัน" ; ; AdminbarElement.php +adminbar_element_skip_nav = "" adminbar_element_admin = "แอดมิ" ; ; ManagecreditsElement.php @@ -909,6 +913,7 @@ social_component_join_group_fee = "ร่วมกับกลุ่มจ่า group_element_auto_logout_one_minute = "อัตโนมัติออกจากระบบ comment ในหนึ่งนาที!!" ; ; SearchbarElement.php +searchbar_element_skip_nav = "" searchbar_element_title = "Yioop-PHP เครื่องมือสำหรับค้นหา name" searchbar_element_input_label = "ป้อนเงื่อนไขคุณต้องการค้นหาบนเว็บสำหรับ" searchbar_element_input_placeholder = "พิมพ์สิ่งที่จะค้นหา" @@ -1137,6 +1142,7 @@ editlocales_element_no_matching = "ไม่ตรงกับเงื่อน editlocales_element_save = "บันทึก" ; ; GroupbarElement.php +groupbar_element_skip_nav = "" groupbar_element_page_list = "หน้ารายการ" groupbar_element_page_thread = " ทั้งหมด %s หน้าที่ %s องกลุ่มกัน" groupbar_element_groupfeed = "แหล่งป้อนทั้งหมด %s" diff --git a/src/locale/th/statistics.txt b/src/locale/th/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/th/statistics.txt +++ b/src/locale/th/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/tl/configure.ini b/src/locale/tl/configure.ini index b325f5846..e668b2a85 100644 --- a/src/locale/tl/configure.ini +++ b/src/locale/tl/configure.ini @@ -467,6 +467,9 @@ crawl_component_one_week = "Isang Linggo" crawl_component_one_month = "Isang Buwan" crawl_component_one_year = "Isang Taon" crawl_component_sources_indexes = "Index/Mix upang Gamitin" +crawl_component_index = "" +crawl_component_mix = "" +crawl_component_trends = "" crawl_component_no_source_type = "Uri ng Source na Hindi Set!" crawl_component_missing_type = "Dapat itakda ang uri ng media!" crawl_component_invalid_url = "Di-wastong URL!" @@ -881,6 +884,7 @@ groupoptions_element_userrss = "User: %s RSS" groupoptions_element_myfeeds = "Aking Mga Feed" ; ; AdminbarElement.php +adminbar_element_skip_nav = "" adminbar_element_admin = "Admin" ; ; ManagecreditsElement.php @@ -909,6 +913,7 @@ social_component_join_group_fee = "Sumali sa mga grupo ng talakayan fee " group_element_auto_logout_one_minute = "Auto-logout sa Isang Minuto!!" ; ; SearchbarElement.php +searchbar_element_skip_nav = "" searchbar_element_title = "Yioop - PHP Search Engine" searchbar_element_input_label = "Ipasok ang mga tuntunin nais mong maghanap sa web para sa" searchbar_element_input_placeholder = "I-Type kung ano upang mahanap ang" @@ -1137,6 +1142,7 @@ editlocales_element_no_matching = "Walang Pagtutugma Ng Mga String Sa Kaliwa Upa editlocales_element_save = "I-Save ang" ; ; GroupbarElement.php +groupbar_element_skip_nav = "" groupbar_element_page_list = "Pahina Ng Listahan" groupbar_element_page_thread = " %s Pahina sa %s mga Grupo ng Talakayan" groupbar_element_groupfeed = "%s Feed" diff --git a/src/locale/tl/statistics.txt b/src/locale/tl/statistics.txt index eedae9b06..a88e2a194 100644 --- a/src/locale/tl/statistics.txt +++ b/src/locale/tl/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/tr/configure.ini b/src/locale/tr/configure.ini index 872af6b04..4381467f3 100755 --- a/src/locale/tr/configure.ini +++ b/src/locale/tr/configure.ini @@ -467,6 +467,9 @@ crawl_component_one_week = "Bir Hafta" crawl_component_one_month = "Bir Ay" crawl_component_one_year = "Bir Yıl" crawl_component_sources_indexes = "Dizin/Karışım Kullanmak " +crawl_component_index = "" +crawl_component_mix = "" +crawl_component_trends = "" crawl_component_no_source_type = "Kaynak türü Ayarlamak Değil!" crawl_component_missing_type = "Medya türü ayarlamanız gerekir." crawl_component_invalid_url = "Geçersiz URL." @@ -881,6 +884,7 @@ groupoptions_element_userrss = "Kullanıcı: %s RSS" groupoptions_element_myfeeds = "Benim Beslemeleri" ; ; AdminbarElement.php +adminbar_element_skip_nav = "" adminbar_element_admin = "Admin" ; ; ManagecreditsElement.php @@ -909,6 +913,7 @@ social_component_join_group_fee = "Tartışma grubu ücreti katıl " group_element_auto_logout_one_minute = "Bir Dakika içinde otomatik çıkış!" ; ; SearchbarElement.php +searchbar_element_skip_nav = "" searchbar_element_title = "Yioop - PHP Arama Motoru" searchbar_element_input_label = "Web'de aramak istediğiniz terimleri girin " searchbar_element_input_placeholder = "Türünü bulmak için ne " @@ -1137,6 +1142,7 @@ editlocales_element_no_matching = "Eşleşen Dizeleri Çevirmek İç editlocales_element_save = "Kaydet" ; ; GroupbarElement.php +groupbar_element_skip_nav = "" groupbar_element_page_list = "Sayfa Listesi" groupbar_element_page_thread = " %s Grup tartışmasında %s Sayfa " groupbar_element_groupfeed = "%s Besleme" diff --git a/src/locale/tr/statistics.txt b/src/locale/tr/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/tr/statistics.txt +++ b/src/locale/tr/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/vi_VN/configure.ini b/src/locale/vi_VN/configure.ini index b6d6d596c..b43a83196 100755 --- a/src/locale/vi_VN/configure.ini +++ b/src/locale/vi_VN/configure.ini @@ -467,6 +467,9 @@ crawl_component_one_week = "Một Tuần" crawl_component_one_month = "Một Tháng" crawl_component_one_year = "Một Năm" crawl_component_sources_indexes = "Chỉ số/Trộn để Sử dụng" +crawl_component_index = "" +crawl_component_mix = "" +crawl_component_trends = "" crawl_component_no_source_type = "Loại Nguồn Không phải là Tập hợp!" crawl_component_missing_type = "Phải thiết lập truyền thông loại!" crawl_component_invalid_url = "Chỉ!" @@ -881,6 +884,7 @@ groupoptions_element_userrss = "Dùng: %s RSS" groupoptions_element_myfeeds = "Thức Ăn Của Tôi" ; ; AdminbarElement.php +adminbar_element_skip_nav = "" adminbar_element_admin = "Quản trị" ; ; ManagecreditsElement.php @@ -909,6 +913,7 @@ social_component_join_group_fee = "Tham gia nhóm thảo luận chi ph&iac group_element_auto_logout_one_minute = "Auto-thoát trong Một Phút!!" ; ; SearchbarElement.php +searchbar_element_skip_nav = "" searchbar_element_title = "Yioop - PHP công Cụ Tìm kiếm" searchbar_element_input_label = "Nhập các điều khoản của bạn muốn tìm trang web miễn" searchbar_element_input_placeholder = "Loại gì để tìm" @@ -1137,6 +1142,7 @@ editlocales_element_no_matching = "Không Phù Hợp Với Dây Trái Dịch!" editlocales_element_save = "Tiết kiệm" ; ; GroupbarElement.php +groupbar_element_skip_nav = "" groupbar_element_page_list = "Trang Sách" groupbar_element_page_thread = " %s Trang tại %s Nhóm cuộc Thảo luận" groupbar_element_groupfeed = "%s thức Ăn" diff --git a/src/locale/vi_VN/statistics.txt b/src/locale/vi_VN/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/vi_VN/statistics.txt +++ b/src/locale/vi_VN/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/zh_CN/configure.ini b/src/locale/zh_CN/configure.ini index 794596cd5..9360299cf 100755 --- a/src/locale/zh_CN/configure.ini +++ b/src/locale/zh_CN/configure.ini @@ -467,6 +467,9 @@ crawl_component_one_week = "一个星期" crawl_component_one_month = "一个月" crawl_component_one_year = "一年" crawl_component_sources_indexes = "Index/混合使用" +crawl_component_index = "" +crawl_component_mix = "" +crawl_component_trends = "" crawl_component_no_source_type = "源类型的不设置！" crawl_component_missing_type = "必须设置媒体类型！" crawl_component_invalid_url = "无效的网址！" @@ -881,6 +884,7 @@ groupoptions_element_userrss = "用户：%sRSS" groupoptions_element_myfeeds = "我的摘要" ; ; AdminbarElement.php +adminbar_element_skip_nav = "" adminbar_element_admin = "管理员" ; ; ManagecreditsElement.php @@ -909,6 +913,7 @@ social_component_join_group_fee = "参加讨论小组的费用 " group_element_auto_logout_one_minute = "自动注销在一个分钟!!" ; ; SearchbarElement.php +searchbar_element_skip_nav = "" searchbar_element_title = "Yioop-PHP搜索引擎" searchbar_element_input_label = "进入条件，你想在网络上搜索" searchbar_element_input_placeholder = "什么类型找到" @@ -1137,6 +1142,7 @@ editlocales_element_no_matching = "没有匹配的串留给翻译！" editlocales_element_save = "保存" ; ; GroupbarElement.php +groupbar_element_skip_nav = "" groupbar_element_page_list = "页面列表" groupbar_element_page_thread = " %s页至%s小组讨论" groupbar_element_groupfeed = "%s料" diff --git a/src/locale/zh_CN/statistics.txt b/src/locale/zh_CN/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/zh_CN/statistics.txt +++ b/src/locale/zh_CN/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/models/PhraseModel.php b/src/models/PhraseModel.php index a4aa1973e..924dcb154 100755 --- a/src/models/PhraseModel.php +++ b/src/models/PhraseModel.php @@ -33,10 +33,12 @@ namespace seekquarry\yioop\models; use seekquarry\yioop\configs as C; use seekquarry\yioop\library as L; use seekquarry\yioop\library\AnalyticsManager; +use seekquarry\yioop\library\FetchUrl; use seekquarry\yioop\library\IndexManager; use seekquarry\yioop\library\PhraseParser; use seekquarry\yioop\library\IndexArchiveBundle; use seekquarry\yioop\library\index_bundle_iterators as I; +use seekquarry\yioop\library\processors\ImageProcessor; /** * logging is done during crawl not through web, @@ -1554,6 +1556,8 @@ class PhraseModel extends ParallelModel Handle robot meta tags present on page */ $base_dir = C\APP_DIR . "/resources"; + $i = 0; + $thumb_sites = []; foreach ($pages as $page) { $key = $page[self::KEY]; if (isset($summaries[$key]) && @@ -1602,10 +1606,37 @@ class PhraseModel extends ParallelModel 'data:image/jpeg;base64,'. base64_encode($this->fileGetContents( $image_path)); + } else if (file_exists($image_path . ".txt")) { + $thumb_sites[$i] = [ + self::FILE_NAME => $image_path, + self::THUMB_URL => + $this->fileGetContents($image_path . ".txt") + ]; } } } - $out_pages[] = $pre_page; + $out_pages[$i] = $pre_page; + $i++; + } + } + } + if (!empty($thumb_sites)) { + $thumb_sites = FetchUrl::getPages($thumb_sites, false, + C\PAGE_RANGE_REQUEST, null, self::THUMB_URL, self::DATA, + true); + foreach ($thumb_sites as $k => $thumb_site) { + if (!empty($thumb_site[self::DATA])) { + set_error_handler(null); + $image = @imagecreatefromstring($thumb_site[self::DATA]); + $thumb_string = ImageProcessor::createThumb($image); + set_error_handler(C\NS_CONFIGS . "yioop_error_handler"); + if ($thumb_string) { + $this->filePutContents( + $thumb_site[self::FILE_NAME], $thumb_string); + $out_pages[$k][self::IMAGE_LINK] = + 'data:image/jpeg;base64,' . + base64_encode($thumb_string); + } } } } diff --git a/src/models/SourceModel.php b/src/models/SourceModel.php index d0c21750f..bcdb149e0 100644 --- a/src/models/SourceModel.php +++ b/src/models/SourceModel.php @@ -95,20 +95,30 @@ class SourceModel extends ParallelModel * Returns the media categories of the search sources that have been * stored * + * @param array $exclude_categories + * @param string $type + * * @return array of arrays distinct ["NAME" => media category, * "TYPE" => source_type] */ - public function getMediaCategories($exclude_categories = []) + public function getMediaCategories($exclude_categories = [], $type = "") { - $sql = "SELECT DISTINCT CATEGORY, TYPE FROM MEDIA_SOURCE"; $db = $this->db; - $result = $db->execute($sql); + $sql = "SELECT DISTINCT CATEGORY, TYPE, TIMESTAMP FROM MEDIA_SOURCE "; + if (!empty($type)) { + $sql .= " WHERE TYPE=:type"; + $result = $db->execute($sql, [":type" => $type]); + } else { + $result = $db->execute($sql); + } $categories = []; while ($row = $db->fetchArray($result)) { $category = $row['CATEGORY']; $type = $row['TYPE']; + $timestamp = $row['TIMESTAMP']; if (!in_array($category, $exclude_categories)) { - $categories[] = ["NAME" => $category, "TYPE" => $type]; + $categories[] = ["NAME" => $category, "TYPE" => $type, + "TIMESTAMP" => $timestamp]; } } return $categories; diff --git a/src/views/elements/AdminbarElement.php b/src/views/elements/AdminbarElement.php index 97d16b70c..25b044a04 100644 --- a/src/views/elements/AdminbarElement.php +++ b/src/views/elements/AdminbarElement.php @@ -58,8 +58,9 @@ class AdminbarElement extends Element $logo = C\LOGO_MEDIUM; if ($_SERVER["MOBILE"]) { $logo = C\LOGO_SMALL; - } ?> - <div id='nav-bar' class="nav-bar"> + } ?><div class="none" >[<a href="#center-container"><?= + tl('adminbar_element_skip_nav') + ?>]</a></div><div id='nav-bar' class="nav-bar"> <div class='inner-bar'> <?php $this->renderSettingsToggle($logged_in); ?> <h1> diff --git a/src/views/elements/GroupbarElement.php b/src/views/elements/GroupbarElement.php index 684c64f42..193a8d986 100644 --- a/src/views/elements/GroupbarElement.php +++ b/src/views/elements/GroupbarElement.php @@ -65,8 +65,10 @@ class GroupbarElement extends Element $base_query = ($is_wiki) ? htmlentities(B\wikiUrl("", true, $data['CONTROLLER'], $data["GROUP"]["GROUP_ID"])) : B\feedsUrl("", "", true, $data['CONTROLLER']) . $token_string; - $admin_url = htmlentities(B\controllerUrl('admin', true)); ?> - <div id='nav-bar' class="nav-bar"> + $admin_url = htmlentities(B\controllerUrl('admin', true)); + ?><div class="none" >[<a href="#center-container"><?= + tl('groupbar_element_skip_nav') + ?>]</a></div><div id='nav-bar' class="nav-bar"> <div class='inner-bar'><?php $this->renderSettingsToggle($logged_in); ?> <h1><a href="<?=C\BASE_URL ?><?php diff --git a/src/views/elements/PaginationElement.php b/src/views/elements/PaginationElement.php index 84b72c817..6332075c4 100644 --- a/src/views/elements/PaginationElement.php +++ b/src/views/elements/PaginationElement.php @@ -59,11 +59,23 @@ class PaginationElement extends Element } $next_limit = $data['LIMIT'] + C\NUM_RESULTS_PER_PAGE; if( $next_limit < $data['TOTAL_ROWS']) { - ?><div class="center"><button id="next-button" - class="button-box" + ?><div class="center"><span class="none">[</span> + <a id="next-button" + class="anchor-button" style="margin:10px; width:60%;" - onclick='javascript:nextPage();' ><?= - tl('pagination_helper_next') ?></button></div><?php + onclick='javascript:nextPage();' + href="<?="$base_url . &limit=next_limit" ?>" + ><?= + tl('pagination_helper_next') ?></a> + <span class="none">]</span> + <script> + document.getElementById('next-button').addEventListener( + "click", function(event) { + nextPage(); + event.preventDefault() + }, true); + </script> + </div><?php } } else { $this->view->helper("pagination")->render($base_url, $data['LIMIT'], diff --git a/src/views/elements/SearchbarElement.php b/src/views/elements/SearchbarElement.php index 646652410..eb1117d1b 100644 --- a/src/views/elements/SearchbarElement.php +++ b/src/views/elements/SearchbarElement.php @@ -59,13 +59,17 @@ class SearchbarElement extends Element if ($_SERVER["MOBILE"]) { $logo = C\BASE_URL . C\LOGO_SMALL; } - if (!empty($data['IS_LANDING'])) { ?> - <div id='nav-bar' class="nav-bar"> + if (!empty($data['IS_LANDING'])) { + ?><div class="none" >[<a href="#search-form"><?= + tl('searchbar_element_skip_nav') + ?>]</a></div><div id='nav-bar' class="nav-bar"> <?php $this->renderSettingsToggle($logged_in); ?> </div><?php return; - } ?> - <div id='nav-bar' class="nav-bar"> + } + ?><div class="none" >[<a href="#center-container"><?= + tl('searchbar_element_skip_nav') + ?>]</a></div><div id='nav-bar' class="nav-bar"> <div class='inner-bar'> <?php $this->renderSettingsToggle($logged_in); ?> <form id="search-form" method="get" action="<?=C\BASE_URL ?>" diff --git a/src/views/elements/SearchsourcesElement.php b/src/views/elements/SearchsourcesElement.php index 43588e4bd..5b978dc0f 100644 --- a/src/views/elements/SearchsourcesElement.php +++ b/src/views/elements/SearchsourcesElement.php @@ -623,7 +623,11 @@ class SearchsourcesElement extends Element </form><?php } /** + * Draws the Subsearch element used to configure subsearches that + * are choosable on landing page and elsewhere * + * @param array $data consists of values of search source fields set + * so far as well as values of the drops downs on the form */ public function renderSubsearchForm($data) {