From e66aa7ba603250f72702bdbac46dab139381c282 Mon Sep 17 00:00:00 2001 From: sb0001 <48289594+sb0001@users.noreply.github.com> Date: Mon, 1 Nov 2021 03:07:23 +0100 Subject: [PATCH] Pagination is now translatable i18n: Page x of y. typos. --- lang/ar_AR.ini | 4 +++- lang/de_DE.ini | 4 +++- lang/en_US.ini | 8 ++++--- lang/es_ES.ini | 4 +++- lang/fr_FR.ini | 2 ++ lang/hu_HU.ini | 4 +++- lang/id_ID.ini | 2 ++ lang/it_IT.ini | 4 +++- lang/ko_KO.ini | 2 ++ lang/ms_MY.ini | 2 ++ lang/nl_NL.ini | 6 +++-- lang/pl_PL.ini | 4 +++- lang/pt_BR.ini | 4 +++- lang/ru_RU.ini | 4 +++- lang/sv_SE.ini | 4 +++- lang/tr_TR.ini | 4 +++- lang/zh_TW.ini | 4 +++- system/includes/functions.php | 54 +++++++++++++++++++++---------------------- 18 files changed, 77 insertions(+), 43 deletions(-) diff --git a/lang/ar_AR.ini b/lang/ar_AR.ini index 2acae40..032e570 100644 --- a/lang/ar_AR.ini +++ b/lang/ar_AR.ini @@ -249,4 +249,6 @@ Page_generation_time = "وقت إنشاء الصفحة" Github_pre_release = "الإصدار التجريبي من Github" Pre_release = "الإصدار التجريبي" Yes_Im_in = "نعم أنا موجود" -Nope = "لا" \ No newline at end of file +Nope = "لا" +Page="Page" +of="of" diff --git a/lang/de_DE.ini b/lang/de_DE.ini index 5038da0..960d511 100644 --- a/lang/de_DE.ini +++ b/lang/de_DE.ini @@ -209,7 +209,7 @@ Breadcrumb_home_text="Bezeichnung für die Startseite im Breadcrumb-Menü" Sitemap="Sitemap" Valid_values_range_from_0_to_1.0._See="Valid values range from 0.0 to 1.0. See" hint_Use_CtrlCMDF_to_search_for_your_config_key_or_value="hint: Use Ctrl/CMD + F to search for your config key or value." -pro_tips_You_can_creating_custom_config_key_and_print_out_your_config_key_value_anywhere_in_your_template="pro tips: You can creating custom config key and print out your config key value anywhere in your template." +pro_tips_You_can_creating_custom_config_key_and_print_out_your_config_key_value_anywhere_in_your_template="pro tips: You can create custom config key and print out your config key value anywhere in your template." your_key="your.key" Your_New_Config_Key="Your New Config Key" Your_New_Value="Your New Value" @@ -248,3 +248,5 @@ Github_pre_release="Github pre-release" Pre_release="Pre-release" Yes_Im_in="Ja, ich bin dabei!" Nope="Nein, danke." +Page="Seite" +of="von" diff --git a/lang/en_US.ini b/lang/en_US.ini index e377334..252fb48 100644 --- a/lang/en_US.ini +++ b/lang/en_US.ini @@ -209,7 +209,7 @@ Breadcrumb_home_text="Breadcrumb home text" Sitemap="Sitemap" Valid_values_range_from_0_to_1.0._See="Valid values range from 0.0 to 1.0. See" hint_Use_CtrlCMDF_to_search_for_your_config_key_or_value="hint: Use Ctrl/CMD + F to search for your config key or value." -pro_tips_You_can_creating_custom_config_key_and_print_out_your_config_key_value_anywhere_in_your_template="pro tips: You can creating custom config key and print out your config key value anywhere in your template." +pro_tips_You_can_creating_custom_config_key_and_print_out_your_config_key_value_anywhere_in_your_template="pro tips: You can create custom config keys and print out your config key value anywhere in your template." your_key="your.key" Your_New_Config_Key="Your New Config Key" Your_New_Value="Your New Value" @@ -218,7 +218,7 @@ Recent_posts_widget_at_most="Recent posts widget at most" Popular_posts_widget="Popular posts widget" Popular_posts_widget_at_most="Popular posts widget at most" Comments="Comments" -To_using_Disqus_or_Facebook_comment_you_need_to_provide_Disqus_shortname_or_Facebook_App_ID="To using Disqus or Facebook comment you need to provide Disqus shortname or Facebook App ID." +To_using_Disqus_or_Facebook_comment_you_need_to_provide_Disqus_shortname_or_Facebook_App_ID="To use Disqus or Facebook comments you need to provide your Disqus shortname or your Facebook App ID." Comment_system="Comment system" Disabled="Disabled" Disqus_shortname="Disqus shortname" @@ -247,4 +247,6 @@ Page_generation_time="Page generation time" Github_pre_release="Github pre-release" Pre_release="Pre-release" Yes_Im_in="Yes I'm in" -Nope="Nope" \ No newline at end of file +Nope="Nope" +Page="Page" +of="of" diff --git a/lang/es_ES.ini b/lang/es_ES.ini index 77e7a7c..deb71df 100644 --- a/lang/es_ES.ini +++ b/lang/es_ES.ini @@ -246,4 +246,6 @@ Page_generation_time="Page generation time" Github_pre_release="Github pre-release" Pre_release="Pre-release" Yes_Im_in="Yes I'm in" -Nope="Nope" \ No newline at end of file +Nope="Nope" +Page="Page" +of="of" diff --git a/lang/fr_FR.ini b/lang/fr_FR.ini index 41a5c9e..a76815f 100644 --- a/lang/fr_FR.ini +++ b/lang/fr_FR.ini @@ -248,3 +248,5 @@ Github_pre_release="Pré-release Github" Pre_release="Pré-release" Yes_Im_in="Oui, je suis prêt" Nope="Non !" +Page="Page" +of="de" diff --git a/lang/hu_HU.ini b/lang/hu_HU.ini index af86782..9fd27a8 100644 --- a/lang/hu_HU.ini +++ b/lang/hu_HU.ini @@ -247,4 +247,6 @@ Page_generation_time="Page generation time" Github_pre_release="Github pre-release" Pre_release="Pre-release" Yes_Im_in="Yes I'm in" -Nope="Nope" \ No newline at end of file +Nope="Nope" +Page="Page" +of="of" diff --git a/lang/id_ID.ini b/lang/id_ID.ini index fed3640..8fa39ad 100644 --- a/lang/id_ID.ini +++ b/lang/id_ID.ini @@ -248,3 +248,5 @@ Github_pre_release="Pra-rilis Github" Pre_release="Pra-rilis" Yes_Im_in="Ya, saya ikut" Nope="Nggak" +Page="Page" +of="of" diff --git a/lang/it_IT.ini b/lang/it_IT.ini index 5e6275a..d0694da 100644 --- a/lang/it_IT.ini +++ b/lang/it_IT.ini @@ -247,4 +247,6 @@ Page_generation_time="Page generation time" Github_pre_release="Github pre-release" Pre_release="Pre-release" Yes_Im_in="Yes I'm in" -Nope="Nope" \ No newline at end of file +Nope="Nope" +Page="Page" +of="of" diff --git a/lang/ko_KO.ini b/lang/ko_KO.ini index feacf4c..82171e2 100644 --- a/lang/ko_KO.ini +++ b/lang/ko_KO.ini @@ -248,3 +248,5 @@ Github_pre_release = "Github에서의 시험판" Pre_release = "사전 출시" Yes_Im_in = "그래, 난에있어" Nope = "아니" +Page="Page" +of="of" diff --git a/lang/ms_MY.ini b/lang/ms_MY.ini index 5cc9f0d..bf42983 100644 --- a/lang/ms_MY.ini +++ b/lang/ms_MY.ini @@ -248,3 +248,5 @@ Github_pre_release = "Github pra keluaran" Pre_release = "Pra-release" Yes_Im_in = "Ya saya setuju" Nope = "Nope" +Page="Page" +of="of" diff --git a/lang/nl_NL.ini b/lang/nl_NL.ini index 996dbd1..24d4211 100644 --- a/lang/nl_NL.ini +++ b/lang/nl_NL.ini @@ -207,7 +207,7 @@ post_your_post_slug="/bericht/uw-bericht-slug" Meta_description_character="Meta beschrijving" Breadcrumb_home_text="Breadcrumb home tekst" Sitemap="Sitemap" -Valid_values_range_from_0_to_1.0._See="Geldige waarden variren van 0,0 tot 1,0. Zie" +Valid_values_range_from_0_to_1.0._See="Geldige waarden vari�ren van 0,0 tot 1,0. Zie" hint_Use_CtrlCMDF_to_search_for_your_config_key_or_value="hint: Use Ctrl/CMD + F to search for your config key or value." pro_tips_You_can_creating_custom_config_key_and_print_out_your_config_key_value_anywhere_in_your_template="pro tips: You can creating custom config key and print out your config key value anywhere in your template." your_key="your.key" @@ -247,4 +247,6 @@ Page_generation_time="Generatietijd pagina" Github_pre_release="Github pre-release" Pre_release="Pre-release" Yes_Im_in="Ja, ik doe mee" -Nope="Nietes" \ No newline at end of file +Nope="Nietes" +Page="Page" +of="of" diff --git a/lang/pl_PL.ini b/lang/pl_PL.ini index 1791c0a..f2d8413 100644 --- a/lang/pl_PL.ini +++ b/lang/pl_PL.ini @@ -248,4 +248,6 @@ Page_generation_time="Page generation time" Github_pre_release="Github pre-release" Pre_release="Pre-release" Yes_Im_in="Yes I'm in" -Nope="Nope" \ No newline at end of file +Nope="Nope" +Page="Page" +of="of" diff --git a/lang/pt_BR.ini b/lang/pt_BR.ini index 91d7a8d..41b14a0 100644 --- a/lang/pt_BR.ini +++ b/lang/pt_BR.ini @@ -247,4 +247,6 @@ Page_generation_time="Tempo de geração da página" Github_pre_release="Pré-lançamento do Github" Pre_release="Pré-lançamento" Yes_Im_in="Sim, estou dentro" -Nope="Não" \ No newline at end of file +Nope="Não" +Page="Page" +of="of" diff --git a/lang/ru_RU.ini b/lang/ru_RU.ini index 9569d35..3951f0c 100644 --- a/lang/ru_RU.ini +++ b/lang/ru_RU.ini @@ -248,4 +248,6 @@ Page_generation_time="Page generation time" Github_pre_release="Github pre-release" Pre_release="Pre-release" Yes_Im_in="Yes I'm in" -Nope="Nope" \ No newline at end of file +Nope="Nope" +Page="Page" +of="of" diff --git a/lang/sv_SE.ini b/lang/sv_SE.ini index b189b31..5bf3ba6 100644 --- a/lang/sv_SE.ini +++ b/lang/sv_SE.ini @@ -265,4 +265,6 @@ Page_generation_time="Page generation time" Github_pre_release="Github pre-release" Pre_release="Pre-release" Yes_Im_in="Yes I'm in" -Nope="Nope" \ No newline at end of file +Nope="Nope" +Page="Page" +of="of" diff --git a/lang/tr_TR.ini b/lang/tr_TR.ini index 618bca3..6616acf 100644 --- a/lang/tr_TR.ini +++ b/lang/tr_TR.ini @@ -247,4 +247,6 @@ Page_generation_time="Page generation time" Github_pre_release="Github pre-release" Pre_release="Pre-release" Yes_Im_in="Yes I'm in" -Nope="Nope" \ No newline at end of file +Nope="Nope" +Page="Page" +of="of" diff --git a/lang/zh_TW.ini b/lang/zh_TW.ini index 31705f7..2b14199 100644 --- a/lang/zh_TW.ini +++ b/lang/zh_TW.ini @@ -247,4 +247,6 @@ Page_generation_time="Page generation time" Github_pre_release="Github pre-release" Pre_release="Pre-release" Yes_Im_in="Yes I'm in" -Nope="Nope" \ No newline at end of file +Nope="Nope" +Page="Page" +of="of" diff --git a/system/includes/functions.php b/system/includes/functions.php index 26f3613..1beb14a 100644 --- a/system/includes/functions.php +++ b/system/includes/functions.php @@ -288,7 +288,7 @@ function get_posts($posts, $page = 1, $perpage = 0) // The post author + author url $post->author = $author; $post->authorUrl = site_url() . 'author/' . $author; - + $profile = get_author($author); if (isset($profile[0])) { $post->authorName = $profile[0]->name; @@ -384,7 +384,7 @@ function get_posts($posts, $page = 1, $perpage = 0) } $post->description = get_content_tag("d", $content, get_description($post->body)); - + $word_count = str_word_count(strip_tags($post->body)); $post->readTime = ceil($word_count / 200); @@ -866,7 +866,7 @@ function get_static_post($static) } $post->description = get_content_tag("d", $content, get_description($post->body)); - + $word_count = str_word_count(strip_tags($post->body)); $post->readTime = ceil($word_count / 200); @@ -913,7 +913,7 @@ function get_static_sub_post($static, $sub_static) $post->views = get_views($post->file); $post->description = get_content_tag("d", $content, get_description($post->body)); - + $word_count = str_word_count(strip_tags($post->body)); $post->readTime = ceil($word_count / 200); @@ -962,7 +962,7 @@ function get_keyword($keyword, $page, $perpage) foreach ($words as $word) { if (stripos($filter, $word) !== false) { if (!in_array($v, $tmp)) { - $tmp[] = $v; + $tmp[] = $v; } } } @@ -1500,7 +1500,7 @@ function tag_cloud($custom = null) foreach ($tag_collection as $tag => $count) { $size = $min_size + (($count - $min_qty) * $step); echo ' '.tag_i18n($tag).' '; - } + } } else { return $tag_collection; @@ -1583,7 +1583,7 @@ function has_pagination($total, $perpage, $page = 1) $total = count(get_post_unsorted()); } $totalPage = ceil($total / $perpage); - $number = 'Page '. $page . ' of ' . $totalPage; + $number = i18n('Page') . ' ' . $page . ' ' . i18n('of') . ' ' . $totalPage; $pager = get_pagination($page, $total, $perpage, 2); return array( 'prev' => $page > 1, @@ -1992,7 +1992,7 @@ function publisher() function analytics() { $analytics = config('google.analytics.id'); - $gtag = config('google.gtag.id'); + $gtag = config('google.gtag.id'); $script = << (function (i,s,o,g,r,a,m) {i['GoogleAnalyticsObject']=r;i[r]=i[r]||function () { @@ -2029,7 +2029,7 @@ function parseNodes($nodes, $child = null, $class = null) { if (empty($child)) { $ul = '