From f68674b35a70bceb4e9d06f47776ae85bfe11652 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 13 Oct 2018 19:51:33 +0200 Subject: Update js_strings.tpl --- view/tpl/js_strings.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index 01fc3f993..f7425ba98 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -34,7 +34,7 @@ 'name_ok1' : "{{$name_ok1}}", 'name_ok2' : "{{$name_ok2}}", - + 'plural_func' : "{{$plural_func}}", 't01' : "{{$t01}}", 't02' : "{{$t02}}", -- cgit v1.2.3 From 3ac4337aec929d6cdf12a1645ab142dc5279bd6c Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 13 Oct 2018 19:52:59 +0200 Subject: Update main.js --- view/js/main.js | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) (limited to 'view') diff --git a/view/js/main.js b/view/js/main.js index 48277f5cc..0c16d0560 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -44,25 +44,27 @@ $(document).ready(function() { $(document).on('click', '.conversation-settings-link', getConversationSettings); $(document).on('click', '#settings_module_ajax_submit', postConversationSettings); - jQuery.timeago.settings.strings = { - prefixAgo : aStr['t01'], - prefixFromNow : aStr['t02'], - suffixAgo : aStr['t03'], - suffixFromNow : aStr['t04'], - seconds : aStr['t05'], - minute : aStr['t06'], - minutes : aStr['t07'], - hour : aStr['t08'], - hours : aStr['t09'], - day : aStr['t10'], - days : aStr['t11'], - month : aStr['t12'], - months : aStr['t13'], - year : aStr['t14'], - years : aStr['t15'], - wordSeparator : aStr['t16'], - numbers : aStr['t17'], - }; + var tf = new Function('n', aStr['plural_func']); + + jQuery.timeago.settings.strings = { + prefixAgo : aStr['t01'], + prefixFromNow : aStr['t02'], + suffixAgo : aStr['t03'], + suffixFromNow : aStr['t04'], + seconds : aStr['t05'], + minute : aStr['t06'], + minutes : function(value){var str=aStr['t07'].split("/")[tf(value)]; return (str ? str : aStr['t07']);}, + hour : aStr['t08'], + hours : function(value){var str=aStr['t09'].split("/")[tf(value)]; return (str ? str : aStr['t09']);}, + day : aStr['t10'], + days : function(value){var str=aStr['t11'].split("/")[tf(value)]; return (str ? str : aStr['t11']);}, + month : aStr['t12'], + months : function(value){var str=aStr['t13'].split("/")[tf(value)]; return (str ? str : aStr['t13']);}, + year : aStr['t14'], + years : function(value){var str=aStr['t15'].split("/")[tf(value)]; return (str ? str : aStr['t15']);}, + wordSeparator : aStr['t16'], + numbers : aStr['t17'], + }; //mod_mail only $(".mail-conv-detail .autotime").timeago(); -- cgit v1.2.3 From ee4a262953f9cd9dfb75f78014a9b64d70b54d21 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sun, 14 Oct 2018 15:21:00 +0200 Subject: Add JS function code for plurals translation --- view/ru/hstrings.php | 1 + 1 file changed, 1 insertion(+) (limited to 'view') diff --git a/view/ru/hstrings.php b/view/ru/hstrings.php index 0479f4109..0f2554730 100644 --- a/view/ru/hstrings.php +++ b/view/ru/hstrings.php @@ -5,6 +5,7 @@ function string_plural_select_ru($n){ return ($n%10==1 && $n%100!=11 ? 0 : ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : 2)); }} App::$rtl = 0; +App::$strings["plural_function_code"] = "return (n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2));"; App::$strings["Source channel not found."] = "Канал-источник не найден."; App::$strings["Default"] = "По умолчанию"; App::$strings["Focus (Hubzilla default)"] = "Фокус (по умолчанию Hubzilla)"; -- cgit v1.2.3 From 8af91b0209d83c0973e927b2e135bf4443295b73 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sun, 14 Oct 2018 22:24:36 +0200 Subject: Update hstrings.php --- view/ru/hstrings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/ru/hstrings.php b/view/ru/hstrings.php index 0f2554730..f536ea963 100644 --- a/view/ru/hstrings.php +++ b/view/ru/hstrings.php @@ -5,7 +5,7 @@ function string_plural_select_ru($n){ return ($n%10==1 && $n%100!=11 ? 0 : ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : 2)); }} App::$rtl = 0; -App::$strings["plural_function_code"] = "return (n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2));"; +App::$strings["plural_function_code"] = "(n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2))"; App::$strings["Source channel not found."] = "Канал-источник не найден."; App::$strings["Default"] = "По умолчанию"; App::$strings["Focus (Hubzilla default)"] = "Фокус (по умолчанию Hubzilla)"; -- cgit v1.2.3 From f9c3b80780ce2e3244d3cf4acd31918b519ce8ae Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sun, 14 Oct 2018 22:28:47 +0200 Subject: Update main.js --- view/js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/js/main.js b/view/js/main.js index 0c16d0560..71bb86df5 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -44,7 +44,7 @@ $(document).ready(function() { $(document).on('click', '.conversation-settings-link', getConversationSettings); $(document).on('click', '#settings_module_ajax_submit', postConversationSettings); - var tf = new Function('n', aStr['plural_func']); + var tf = new Function('n', 'return '+aStr['plural_func']+';'); jQuery.timeago.settings.strings = { prefixAgo : aStr['t01'], -- cgit v1.2.3 From ce52c27a8a4f0837b06a761c20cd097966cd47e8 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sun, 14 Oct 2018 22:45:11 +0200 Subject: Update main.js --- view/js/main.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'view') diff --git a/view/js/main.js b/view/js/main.js index 71bb86df5..085bc8d0d 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -44,7 +44,7 @@ $(document).ready(function() { $(document).on('click', '.conversation-settings-link', getConversationSettings); $(document).on('click', '#settings_module_ajax_submit', postConversationSettings); - var tf = new Function('n', 'return '+aStr['plural_func']+';'); + var tf = new Function('n', 's', 'var k = s.split("/")['+aStr['plural_func']+']; return (k ? k : s);'); jQuery.timeago.settings.strings = { prefixAgo : aStr['t01'], @@ -53,19 +53,20 @@ $(document).ready(function() { suffixFromNow : aStr['t04'], seconds : aStr['t05'], minute : aStr['t06'], - minutes : function(value){var str=aStr['t07'].split("/")[tf(value)]; return (str ? str : aStr['t07']);}, + minutes : function(value){return tf(value, aStr['t07']);}, hour : aStr['t08'], - hours : function(value){var str=aStr['t09'].split("/")[tf(value)]; return (str ? str : aStr['t09']);}, + hours : function(value){return tf(value, aStr['t09']);}, day : aStr['t10'], - days : function(value){var str=aStr['t11'].split("/")[tf(value)]; return (str ? str : aStr['t11']);}, + days : function(value){return tf(value, aStr['t11']);}, month : aStr['t12'], - months : function(value){var str=aStr['t13'].split("/")[tf(value)]; return (str ? str : aStr['t13']);}, + months : function(value){return tf(value, aStr['t13']);}, year : aStr['t14'], - years : function(value){var str=aStr['t15'].split("/")[tf(value)]; return (str ? str : aStr['t15']);}, + years : function(value){return tf(value, aStr['t15']);}, wordSeparator : aStr['t16'], numbers : aStr['t17'], }; + //mod_mail only $(".mail-conv-detail .autotime").timeago(); -- cgit v1.2.3 From 04edb741a674d27d200857a367b31ace2fa12e9f Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Mon, 15 Oct 2018 21:28:01 +0200 Subject: Add Russian translations to Newmember widget --- view/ru/hmessages.po | 214 +++++++++++++++++++++++++++------------------------ 1 file changed, 113 insertions(+), 101 deletions(-) (limited to 'view') diff --git a/view/ru/hmessages.po b/view/ru/hmessages.po index cd785137d..5b645d544 100644 --- a/view/ru/hmessages.po +++ b/view/ru/hmessages.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: hubzilla\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-06 17:07+0200\n" -"PO-Revision-Date: 2018-10-12 21:32+0200\n" +"POT-Creation-Date: 2018-10-15 21:15+0200\n" +"PO-Revision-Date: 2018-10-15 21:17+0200\n" "Last-Translator: Max Kostikov \n" "Language-Team: Russian (http://www.transifex.com/Friendica/hubzilla/language/ru/)\n" "MIME-Version: 1.0\n" @@ -722,7 +722,7 @@ msgstr "Спроси меня" #: ../../Zotlabs/Module/Invite.php:102 ../../Zotlabs/Module/Articles.php:80 #: ../../Zotlabs/Module/Cloud.php:40 ../../Zotlabs/Module/Pdledit.php:34 #: ../../Zotlabs/Module/Wiki.php:59 ../../Zotlabs/Module/Wiki.php:285 -#: ../../Zotlabs/Module/Wiki.php:429 ../../Zotlabs/Module/Manage.php:10 +#: ../../Zotlabs/Module/Wiki.php:428 ../../Zotlabs/Module/Manage.php:10 #: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Module/Cards.php:81 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 #: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Web/WebServer.php:123 @@ -892,7 +892,7 @@ msgstr "Просмотреть все %d общих контактов" #: ../../Zotlabs/Module/Connections.php:342 #: ../../Zotlabs/Module/Card_edit.php:99 #: ../../Zotlabs/Module/Article_edit.php:99 ../../Zotlabs/Module/Blocks.php:160 -#: ../../Zotlabs/Module/Wiki.php:211 ../../Zotlabs/Module/Wiki.php:385 +#: ../../Zotlabs/Module/Wiki.php:211 ../../Zotlabs/Module/Wiki.php:384 #: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Widget/Cdav.php:126 #: ../../Zotlabs/Widget/Cdav.php:162 ../../Zotlabs/Lib/Apps.php:534 #: ../../Zotlabs/Lib/ThreadItem.php:130 @@ -1874,47 +1874,47 @@ msgstr "расслабленный" msgid "surprised" msgstr "удивленный" -#: ../../include/text.php:1377 ../../include/js_strings.php:93 +#: ../../include/text.php:1377 ../../include/js_strings.php:95 msgid "Monday" msgstr "Понедельник" -#: ../../include/text.php:1377 ../../include/js_strings.php:94 +#: ../../include/text.php:1377 ../../include/js_strings.php:96 msgid "Tuesday" msgstr "Вторник" -#: ../../include/text.php:1377 ../../include/js_strings.php:95 +#: ../../include/text.php:1377 ../../include/js_strings.php:97 msgid "Wednesday" msgstr "Среда" -#: ../../include/text.php:1377 ../../include/js_strings.php:96 +#: ../../include/text.php:1377 ../../include/js_strings.php:98 msgid "Thursday" msgstr "Четверг" -#: ../../include/text.php:1377 ../../include/js_strings.php:97 +#: ../../include/text.php:1377 ../../include/js_strings.php:99 msgid "Friday" msgstr "Пятница" -#: ../../include/text.php:1377 ../../include/js_strings.php:98 +#: ../../include/text.php:1377 ../../include/js_strings.php:100 msgid "Saturday" msgstr "Суббота" -#: ../../include/text.php:1377 ../../include/js_strings.php:92 +#: ../../include/text.php:1377 ../../include/js_strings.php:94 msgid "Sunday" msgstr "Воскресенье" -#: ../../include/text.php:1381 ../../include/js_strings.php:68 +#: ../../include/text.php:1381 ../../include/js_strings.php:70 msgid "January" msgstr "Январь" -#: ../../include/text.php:1381 ../../include/js_strings.php:69 +#: ../../include/text.php:1381 ../../include/js_strings.php:71 msgid "February" msgstr "Февраль" -#: ../../include/text.php:1381 ../../include/js_strings.php:70 +#: ../../include/text.php:1381 ../../include/js_strings.php:72 msgid "March" msgstr "Март" -#: ../../include/text.php:1381 ../../include/js_strings.php:71 +#: ../../include/text.php:1381 ../../include/js_strings.php:73 msgid "April" msgstr "Апрель" @@ -1922,31 +1922,31 @@ msgstr "Апрель" msgid "May" msgstr "Май" -#: ../../include/text.php:1381 ../../include/js_strings.php:73 +#: ../../include/text.php:1381 ../../include/js_strings.php:75 msgid "June" msgstr "Июнь" -#: ../../include/text.php:1381 ../../include/js_strings.php:74 +#: ../../include/text.php:1381 ../../include/js_strings.php:76 msgid "July" msgstr "Июль" -#: ../../include/text.php:1381 ../../include/js_strings.php:75 +#: ../../include/text.php:1381 ../../include/js_strings.php:77 msgid "August" msgstr "Август" -#: ../../include/text.php:1381 ../../include/js_strings.php:76 +#: ../../include/text.php:1381 ../../include/js_strings.php:78 msgid "September" msgstr "Сентябрь" -#: ../../include/text.php:1381 ../../include/js_strings.php:77 +#: ../../include/text.php:1381 ../../include/js_strings.php:79 msgid "October" msgstr "Октябрь" -#: ../../include/text.php:1381 ../../include/js_strings.php:78 +#: ../../include/text.php:1381 ../../include/js_strings.php:80 msgid "November" msgstr "Ноябрь" -#: ../../include/text.php:1381 ../../include/js_strings.php:79 +#: ../../include/text.php:1381 ../../include/js_strings.php:81 msgid "December" msgstr "Декабрь" @@ -1976,7 +1976,7 @@ msgstr "удалить из файла" msgid "Link to Source" msgstr "Ссылка на источник" -#: ../../include/text.php:1872 ../../include/language.php:397 +#: ../../include/text.php:1872 ../../include/language.php:423 msgid "default" msgstr "по умолчанию" @@ -1989,7 +1989,7 @@ msgid "You can create your own with the layouts tool" msgstr "Вы можете создать свой собственный с помощью инструмента шаблонов" #: ../../include/text.php:1890 ../../Zotlabs/Module/Wiki.php:217 -#: ../../Zotlabs/Module/Wiki.php:372 ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../Zotlabs/Module/Wiki.php:371 ../../Zotlabs/Widget/Wiki_pages.php:38 #: ../../Zotlabs/Widget/Wiki_pages.php:95 msgid "BBcode" msgstr "" @@ -1999,7 +1999,7 @@ msgid "HTML" msgstr "" #: ../../include/text.php:1892 ../../Zotlabs/Module/Wiki.php:217 -#: ../../Zotlabs/Module/Wiki.php:372 ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../Zotlabs/Module/Wiki.php:371 ../../Zotlabs/Widget/Wiki_pages.php:38 #: ../../Zotlabs/Widget/Wiki_pages.php:95 #: ../../extend/addon/hzaddons/mdpost/mdpost.php:41 msgid "Markdown" @@ -2756,13 +2756,13 @@ msgid "Where are you right now?" msgstr "Где вы сейчас?" #: ../../include/conversation.php:1342 ../../Zotlabs/Module/Cover_photo.php:401 -#: ../../Zotlabs/Module/Profile_photo.php:467 ../../Zotlabs/Module/Wiki.php:404 +#: ../../Zotlabs/Module/Profile_photo.php:467 ../../Zotlabs/Module/Wiki.php:403 #: ../../extend/addon/hzaddons/hsse/hsse.php:139 msgid "Choose images to embed" msgstr "Выбрать изображения для встраивания" #: ../../include/conversation.php:1343 ../../Zotlabs/Module/Cover_photo.php:402 -#: ../../Zotlabs/Module/Profile_photo.php:468 ../../Zotlabs/Module/Wiki.php:405 +#: ../../Zotlabs/Module/Profile_photo.php:468 ../../Zotlabs/Module/Wiki.php:404 #: ../../extend/addon/hzaddons/hsse/hsse.php:140 msgid "Choose an album" msgstr "Выбрать альбом" @@ -2773,19 +2773,19 @@ msgid "Choose a different album..." msgstr "Выбрать другой альбом..." #: ../../include/conversation.php:1345 ../../Zotlabs/Module/Cover_photo.php:404 -#: ../../Zotlabs/Module/Profile_photo.php:470 ../../Zotlabs/Module/Wiki.php:407 +#: ../../Zotlabs/Module/Profile_photo.php:470 ../../Zotlabs/Module/Wiki.php:406 #: ../../extend/addon/hzaddons/hsse/hsse.php:142 msgid "Error getting album list" msgstr "Ошибка получения списка альбомов" #: ../../include/conversation.php:1346 ../../Zotlabs/Module/Cover_photo.php:405 -#: ../../Zotlabs/Module/Profile_photo.php:471 ../../Zotlabs/Module/Wiki.php:408 +#: ../../Zotlabs/Module/Profile_photo.php:471 ../../Zotlabs/Module/Wiki.php:407 #: ../../extend/addon/hzaddons/hsse/hsse.php:143 msgid "Error getting photo link" msgstr "Ошибка получения ссылки на фотографию" #: ../../include/conversation.php:1347 ../../Zotlabs/Module/Cover_photo.php:406 -#: ../../Zotlabs/Module/Profile_photo.php:472 ../../Zotlabs/Module/Wiki.php:409 +#: ../../Zotlabs/Module/Profile_photo.php:472 ../../Zotlabs/Module/Wiki.php:408 #: ../../extend/addon/hzaddons/hsse/hsse.php:144 msgid "Error getting album" msgstr "Ошибка получения альбома" @@ -2855,7 +2855,7 @@ msgstr "Код" msgid "Attach/Upload file" msgstr "Прикрепить/загрузить файл" -#: ../../include/conversation.php:1411 ../../Zotlabs/Module/Wiki.php:401 +#: ../../include/conversation.php:1411 ../../Zotlabs/Module/Wiki.php:400 #: ../../extend/addon/hzaddons/hsse/hsse.php:208 msgid "Embed an image from your albums" msgstr "Встроить изображение из ваших альбомов" @@ -2874,8 +2874,8 @@ msgstr "Встроить изображение из ваших альбомов #: ../../Zotlabs/Module/Profile_photo.php:465 #: ../../Zotlabs/Module/Editpost.php:109 ../../Zotlabs/Module/Connedit.php:925 #: ../../Zotlabs/Module/Card_edit.php:131 -#: ../../Zotlabs/Module/Article_edit.php:131 ../../Zotlabs/Module/Wiki.php:369 -#: ../../Zotlabs/Module/Wiki.php:402 ../../Zotlabs/Module/Filer.php:55 +#: ../../Zotlabs/Module/Article_edit.php:131 ../../Zotlabs/Module/Wiki.php:368 +#: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Filer.php:55 #: ../../extend/addon/hzaddons/hsse/hsse.php:209 #: ../../extend/addon/hzaddons/hsse/hsse.php:258 msgid "Cancel" @@ -2883,7 +2883,7 @@ msgstr "Отменить" #: ../../include/conversation.php:1413 ../../include/conversation.php:1460 #: ../../Zotlabs/Module/Cover_photo.php:400 -#: ../../Zotlabs/Module/Profile_photo.php:466 ../../Zotlabs/Module/Wiki.php:403 +#: ../../Zotlabs/Module/Profile_photo.php:466 ../../Zotlabs/Module/Wiki.php:402 #: ../../extend/addon/hzaddons/hsse/hsse.php:210 #: ../../extend/addon/hzaddons/hsse/hsse.php:257 msgid "OK" @@ -3045,7 +3045,7 @@ msgstr "не нравится" msgid "dislikes" msgstr "не нравится" -#: ../../include/language.php:410 +#: ../../include/language.php:436 msgid "Select an alternate language" msgstr "Выбор дополнительного языка" @@ -3180,7 +3180,7 @@ msgstr "Это " msgid " channel name" msgstr " название канала" -#: ../../include/js_strings.php:42 ../../include/js_strings.php:56 +#: ../../include/js_strings.php:41 #, php-format msgid "%d minutes" msgid_plural "%d minutes" @@ -3188,7 +3188,7 @@ msgstr[0] "%d минуту" msgstr[1] "%d минуты" msgstr[2] "%d минут" -#: ../../include/js_strings.php:43 ../../include/js_strings.php:58 +#: ../../include/js_strings.php:42 #, php-format msgid "about %d hours" msgid_plural "about %d hours" @@ -3196,7 +3196,7 @@ msgstr[0] "около %d часa" msgstr[1] "около %d часов" msgstr[2] "около %d часов" -#: ../../include/js_strings.php:44 ../../include/js_strings.php:60 +#: ../../include/js_strings.php:43 #, php-format msgid "%d days" msgid_plural "%d days" @@ -3204,7 +3204,7 @@ msgstr[0] "%d день" msgstr[1] "%d дня" msgstr[2] "%d дней" -#: ../../include/js_strings.php:45 ../../include/js_strings.php:62 +#: ../../include/js_strings.php:44 #, php-format msgid "%d months" msgid_plural "%d months" @@ -3212,7 +3212,7 @@ msgstr[0] "%d месяц" msgstr[1] "%d месяца" msgstr[2] "%d месяцев" -#: ../../include/js_strings.php:46 ../../include/js_strings.php:64 +#: ../../include/js_strings.php:45 #, php-format msgid "%d years" msgid_plural "%d years" @@ -3220,157 +3220,157 @@ msgstr[0] "%d год" msgstr[1] "%d года" msgstr[2] "%d лет" -#: ../../include/js_strings.php:48 +#: ../../include/js_strings.php:50 msgid "timeago.prefixAgo" msgstr "" -#: ../../include/js_strings.php:49 +#: ../../include/js_strings.php:51 msgid "timeago.prefixFromNow" msgstr "через" -#: ../../include/js_strings.php:50 +#: ../../include/js_strings.php:52 msgid "timeago.suffixAgo" msgstr "назад" -#: ../../include/js_strings.php:51 +#: ../../include/js_strings.php:53 msgid "timeago.suffixFromNow" msgstr "" -#: ../../include/js_strings.php:54 +#: ../../include/js_strings.php:56 msgid "less than a minute" msgstr "менее чем одну минуту" -#: ../../include/js_strings.php:55 +#: ../../include/js_strings.php:57 msgid "about a minute" msgstr "около минуты" -#: ../../include/js_strings.php:57 +#: ../../include/js_strings.php:59 msgid "about an hour" msgstr "около часа" -#: ../../include/js_strings.php:59 +#: ../../include/js_strings.php:61 msgid "a day" msgstr "день" -#: ../../include/js_strings.php:61 +#: ../../include/js_strings.php:63 msgid "about a month" msgstr "около месяца" -#: ../../include/js_strings.php:63 +#: ../../include/js_strings.php:65 msgid "about a year" msgstr "около года" -#: ../../include/js_strings.php:65 +#: ../../include/js_strings.php:67 msgid " " msgstr " " -#: ../../include/js_strings.php:66 +#: ../../include/js_strings.php:68 msgid "timeago.numbers" msgstr "" -#: ../../include/js_strings.php:72 +#: ../../include/js_strings.php:74 msgctxt "long" msgid "May" msgstr "Май" -#: ../../include/js_strings.php:80 +#: ../../include/js_strings.php:82 msgid "Jan" msgstr "Янв" -#: ../../include/js_strings.php:81 +#: ../../include/js_strings.php:83 msgid "Feb" msgstr "Фев" -#: ../../include/js_strings.php:82 +#: ../../include/js_strings.php:84 msgid "Mar" msgstr "Мар" -#: ../../include/js_strings.php:83 +#: ../../include/js_strings.php:85 msgid "Apr" msgstr "Апр" -#: ../../include/js_strings.php:84 +#: ../../include/js_strings.php:86 msgctxt "short" msgid "May" msgstr "Май" -#: ../../include/js_strings.php:85 +#: ../../include/js_strings.php:87 msgid "Jun" msgstr "Июн" -#: ../../include/js_strings.php:86 +#: ../../include/js_strings.php:88 msgid "Jul" msgstr "Июл" -#: ../../include/js_strings.php:87 +#: ../../include/js_strings.php:89 msgid "Aug" msgstr "Авг" -#: ../../include/js_strings.php:88 +#: ../../include/js_strings.php:90 msgid "Sep" msgstr "Сен" -#: ../../include/js_strings.php:89 +#: ../../include/js_strings.php:91 msgid "Oct" msgstr "Окт" -#: ../../include/js_strings.php:90 +#: ../../include/js_strings.php:92 msgid "Nov" msgstr "Ноя" -#: ../../include/js_strings.php:91 +#: ../../include/js_strings.php:93 msgid "Dec" msgstr "Дек" -#: ../../include/js_strings.php:99 +#: ../../include/js_strings.php:101 msgid "Sun" msgstr "Вск" -#: ../../include/js_strings.php:100 +#: ../../include/js_strings.php:102 msgid "Mon" msgstr "Пон" -#: ../../include/js_strings.php:101 +#: ../../include/js_strings.php:103 msgid "Tue" msgstr "Вт" -#: ../../include/js_strings.php:102 +#: ../../include/js_strings.php:104 msgid "Wed" msgstr "Ср" -#: ../../include/js_strings.php:103 +#: ../../include/js_strings.php:105 msgid "Thu" msgstr "Чет" -#: ../../include/js_strings.php:104 +#: ../../include/js_strings.php:106 msgid "Fri" msgstr "Пят" -#: ../../include/js_strings.php:105 +#: ../../include/js_strings.php:107 msgid "Sat" msgstr "Суб" -#: ../../include/js_strings.php:106 +#: ../../include/js_strings.php:108 msgctxt "calendar" msgid "today" msgstr "сегодня" -#: ../../include/js_strings.php:107 +#: ../../include/js_strings.php:109 msgctxt "calendar" msgid "month" msgstr "месяц" -#: ../../include/js_strings.php:108 +#: ../../include/js_strings.php:110 msgctxt "calendar" msgid "week" msgstr "неделя" -#: ../../include/js_strings.php:109 +#: ../../include/js_strings.php:111 msgctxt "calendar" msgid "day" msgstr "день" -#: ../../include/js_strings.php:110 +#: ../../include/js_strings.php:112 msgctxt "calendar" msgid "All day" msgstr "Весь день" @@ -6000,7 +6000,7 @@ msgstr "Создать событие" #: ../../Zotlabs/Module/Events.php:695 ../../Zotlabs/Module/Pubsites.php:60 #: ../../Zotlabs/Module/Webpages.php:261 ../../Zotlabs/Module/Blocks.php:166 -#: ../../Zotlabs/Module/Wiki.php:213 ../../Zotlabs/Module/Wiki.php:410 +#: ../../Zotlabs/Module/Wiki.php:213 ../../Zotlabs/Module/Wiki.php:409 #: ../../Zotlabs/Module/Layouts.php:198 msgid "View" msgstr "Просмотр" @@ -6176,7 +6176,7 @@ msgid "Use a photo from your albums" msgstr "Использовать фотографию из ваших альбомов" #: ../../Zotlabs/Module/Cover_photo.php:403 -#: ../../Zotlabs/Module/Profile_photo.php:469 ../../Zotlabs/Module/Wiki.php:406 +#: ../../Zotlabs/Module/Profile_photo.php:469 ../../Zotlabs/Module/Wiki.php:405 msgid "Choose a different album" msgstr "Выбрать другой альбом" @@ -6835,7 +6835,7 @@ msgid "Link post titles to source" msgstr "Ссылки на источник заголовков публикаций" #: ../../Zotlabs/Module/Settings/Display.php:205 -#: ../../Zotlabs/Widget/Newmember.php:69 +#: ../../Zotlabs/Widget/Newmember.php:75 msgid "New Member Links" msgstr "Ссылки для новичков" @@ -10489,85 +10489,85 @@ msgstr "Ошибка при получении содержимого стран msgid "New page" msgstr "Новая страница" -#: ../../Zotlabs/Module/Wiki.php:367 +#: ../../Zotlabs/Module/Wiki.php:366 msgid "Revision Comparison" msgstr "Сравнение ревизий" -#: ../../Zotlabs/Module/Wiki.php:368 +#: ../../Zotlabs/Module/Wiki.php:367 #: ../../Zotlabs/Widget/Wiki_page_history.php:25 #: ../../Zotlabs/Lib/NativeWikiPage.php:564 msgid "Revert" msgstr "Отменить" -#: ../../Zotlabs/Module/Wiki.php:375 +#: ../../Zotlabs/Module/Wiki.php:374 msgid "Short description of your changes (optional)" msgstr "Краткое описание ваших изменений (необязательно)" -#: ../../Zotlabs/Module/Wiki.php:385 +#: ../../Zotlabs/Module/Wiki.php:384 msgid "Source" msgstr "Источник" -#: ../../Zotlabs/Module/Wiki.php:395 +#: ../../Zotlabs/Module/Wiki.php:394 msgid "New page name" msgstr "Новое имя страницы" -#: ../../Zotlabs/Module/Wiki.php:400 +#: ../../Zotlabs/Module/Wiki.php:399 msgid "Embed image from photo albums" msgstr "Встроить изображение из фотоальбома" -#: ../../Zotlabs/Module/Wiki.php:411 +#: ../../Zotlabs/Module/Wiki.php:410 msgid "History" msgstr "История" -#: ../../Zotlabs/Module/Wiki.php:489 +#: ../../Zotlabs/Module/Wiki.php:488 msgid "Error creating wiki. Invalid name." msgstr "Ошибка создания Wiki. Неверное имя." -#: ../../Zotlabs/Module/Wiki.php:496 +#: ../../Zotlabs/Module/Wiki.php:495 msgid "A wiki with this name already exists." msgstr "Wiki с таким именем уже существует." -#: ../../Zotlabs/Module/Wiki.php:509 +#: ../../Zotlabs/Module/Wiki.php:508 msgid "Wiki created, but error creating Home page." msgstr "Wiki создана, но возникла ошибка при создании домашней страницы" -#: ../../Zotlabs/Module/Wiki.php:516 +#: ../../Zotlabs/Module/Wiki.php:515 msgid "Error creating wiki" msgstr "Ошибка при создании Wiki" -#: ../../Zotlabs/Module/Wiki.php:540 +#: ../../Zotlabs/Module/Wiki.php:539 msgid "Error updating wiki. Invalid name." msgstr "Ошибка при обновлении Wiki. Неверное имя." -#: ../../Zotlabs/Module/Wiki.php:560 +#: ../../Zotlabs/Module/Wiki.php:559 msgid "Error updating wiki" msgstr "Ошибка при обновлении Wiki" -#: ../../Zotlabs/Module/Wiki.php:575 +#: ../../Zotlabs/Module/Wiki.php:574 msgid "Wiki delete permission denied." msgstr "Нет прав на удаление Wiki." -#: ../../Zotlabs/Module/Wiki.php:585 +#: ../../Zotlabs/Module/Wiki.php:584 msgid "Error deleting wiki" msgstr "Ошибка удаления Wiki" -#: ../../Zotlabs/Module/Wiki.php:618 +#: ../../Zotlabs/Module/Wiki.php:617 msgid "New page created" msgstr "Создана новая страница" -#: ../../Zotlabs/Module/Wiki.php:740 +#: ../../Zotlabs/Module/Wiki.php:739 msgid "Cannot delete Home" msgstr "Невозможно удалить домашнюю страницу" -#: ../../Zotlabs/Module/Wiki.php:804 +#: ../../Zotlabs/Module/Wiki.php:803 msgid "Current Revision" msgstr "Текущая ревизия" -#: ../../Zotlabs/Module/Wiki.php:804 +#: ../../Zotlabs/Module/Wiki.php:803 msgid "Selected Revision" msgstr "Выбранная ревизия" -#: ../../Zotlabs/Module/Wiki.php:854 +#: ../../Zotlabs/Module/Wiki.php:853 msgid "You must be authenticated." msgstr "Вы должны быть аутентифицированы." @@ -11255,7 +11255,19 @@ msgstr "Просмотреть ваш сетевой поток" msgid "Documentation" msgstr "Документация" -#: ../../Zotlabs/Widget/Newmember.php:65 +#: ../../Zotlabs/Widget/Newmember.php:57 +msgid "Missing Features?" +msgstr "Отсутствует функция?" + +#: ../../Zotlabs/Widget/Newmember.php:59 +msgid "Pin apps to navigation bar" +msgstr "Прикрепить приложение к панели" + +#: ../../Zotlabs/Widget/Newmember.php:60 +msgid "Install more apps" +msgstr "Установить больше приложений" + +#: ../../Zotlabs/Widget/Newmember.php:71 msgid "View public stream" msgstr "Просмотреть публичный поток" -- cgit v1.2.3 From d2d6f8c970ed6b96316f8a47d81dc85831664db0 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Mon, 15 Oct 2018 21:28:54 +0200 Subject: Update hstrings.php --- view/ru/hstrings.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'view') diff --git a/view/ru/hstrings.php b/view/ru/hstrings.php index f536ea963..32266af51 100644 --- a/view/ru/hstrings.php +++ b/view/ru/hstrings.php @@ -2559,6 +2559,9 @@ App::$strings["Communicate"] = "Связаться"; App::$strings["View your channel homepage"] = "Домашняя страница канала"; App::$strings["View your network stream"] = "Просмотреть ваш сетевой поток"; App::$strings["Documentation"] = "Документация"; +App::$strings["Missing Features?"] = "Отсутствует функция?"; +App::$strings["Pin apps to navigation bar"] = "Прикрепить приложение к панели"; +App::$strings["Install more apps"] = "Установить больше приложений"; App::$strings["View public stream"] = "Просмотреть публичный поток"; App::$strings["Private Mail Menu"] = "Меню личной переписки"; App::$strings["Combined View"] = "Комбинированный вид"; -- cgit v1.2.3 From ac2b6bcc33bc503a97e37c9da306daa7e428606d Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Thu, 18 Oct 2018 11:18:14 +0200 Subject: Russian translation for upgrade plugin added --- view/ru/hmessages.po | 50 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 10 deletions(-) (limited to 'view') diff --git a/view/ru/hmessages.po b/view/ru/hmessages.po index 5b645d544..d21f707d1 100644 --- a/view/ru/hmessages.po +++ b/view/ru/hmessages.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: hubzilla\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-15 21:15+0200\n" -"PO-Revision-Date: 2018-10-15 21:17+0200\n" +"POT-Creation-Date: 2018-10-18 11:03+0200\n" +"PO-Revision-Date: 2018-10-18 11:06+0200\n" "Last-Translator: Max Kostikov \n" "Language-Team: Russian (http://www.transifex.com/Friendica/hubzilla/language/ru/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgid "Focus (Hubzilla default)" msgstr "Фокус (по умолчанию Hubzilla)" #: ../../view/theme/redbasic/php/config.php:94 ../../include/js_strings.php:22 -#: ../../Zotlabs/Module/Mail.php:431 ../../Zotlabs/Module/Pconfig.php:107 +#: ../../Zotlabs/Module/Mail.php:431 ../../Zotlabs/Module/Pconfig.php:111 #: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Permcats.php:128 #: ../../Zotlabs/Module/Xchan.php:15 #: ../../Zotlabs/Module/Email_validation.php:40 @@ -4265,15 +4265,15 @@ msgstr "Отправить ответ" msgid "Your message for %s (%s):" msgstr "Ваше сообщение для %s (%s):" -#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59 +#: ../../Zotlabs/Module/Pconfig.php:27 ../../Zotlabs/Module/Pconfig.php:63 msgid "This setting requires special processing and editing has been blocked." msgstr "Этот параметр требует специальной обработки и редактирования и был заблокирован." -#: ../../Zotlabs/Module/Pconfig.php:48 +#: ../../Zotlabs/Module/Pconfig.php:52 msgid "Configuration Editor" msgstr "Редактор конфигурации" -#: ../../Zotlabs/Module/Pconfig.php:49 +#: ../../Zotlabs/Module/Pconfig.php:53 msgid "" "Warning: Changing some settings could render your channel inoperable. Please " "leave this page unless you are comfortable with and knowledgeable about how " @@ -10428,7 +10428,7 @@ msgstr "Предоставьте Wiki для вашего канала" #: ../../Zotlabs/Module/Wiki.php:77 #: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:456 #: ../../extend/addon/hzaddons/cart/myshop.php:37 -#: ../../extend/addon/hzaddons/cart/manual_payments.php:63 +#: ../../extend/addon/hzaddons/cart/manual_payments.php:93 #: ../../extend/addon/hzaddons/cart/cart.php:1440 msgid "Invalid channel" msgstr "Недействительный канал" @@ -14159,7 +14159,7 @@ msgid "" msgstr "Кнопка Paypal для платежей настроена неправильно. Пожалуйста, используйте другой вариант оплаты." #: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:392 -#: ../../extend/addon/hzaddons/cart/manual_payments.php:38 +#: ../../extend/addon/hzaddons/cart/manual_payments.php:68 #: ../../extend/addon/hzaddons/cart/cart.php:1462 msgid "Order not found." msgstr "Заказ не найден." @@ -14188,11 +14188,11 @@ msgstr "Недействительный элемент" msgid "Error: order mismatch. Please try again." msgstr "Ошибка: несоответствие заказа. Пожалуйста, попробуйте ещё раз" -#: ../../extend/addon/hzaddons/cart/manual_payments.php:31 +#: ../../extend/addon/hzaddons/cart/manual_payments.php:61 msgid "Manual payments are not enabled." msgstr "Ручные платежи не подключены." -#: ../../extend/addon/hzaddons/cart/manual_payments.php:47 +#: ../../extend/addon/hzaddons/cart/manual_payments.php:77 msgid "Finished" msgstr "Завершено" @@ -14266,6 +14266,36 @@ msgstr "Разрешить федерацию публикаций по умол msgid "NoFed Settings" msgstr "Настройки NoFed" +#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:43 +msgid "Your channel has been upgraded to the latest $Projectname version." +msgstr "Ваш канал был обновлён на последнюю версию $Projectname." + +#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:44 +msgid "" +"To improve usability, we have converted some features into installable stand-" +"alone apps." +msgstr "Чтобы улучшить удобство использования, некоторые функции теперь доступны в виде устанавливаемых автономных приложений." + +#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:45 +msgid "Please visit the $Projectname" +msgstr "Пожалуйста, посетите $Projectname" + +#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:46 +msgid "app store" +msgstr "раздел \"Приложения\"" + +#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:47 +msgid "and install possibly missing apps." +msgstr "и установите необходимые вам." + +#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:52 +msgid "Upgrade Info" +msgstr "Сведения об обновлении" + +#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:56 +msgid "Do not show this again" +msgstr "Больше не показывать" + #: ../../extend/addon/hzaddons/gravatar/gravatar.php:123 msgid "generic profile image" msgstr "Стандартное изображение профиля" -- cgit v1.2.3 From 6e75842354c5a17053a14f9368afbb8b9962ae13 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Thu, 18 Oct 2018 11:19:02 +0200 Subject: Update hstrings.php --- view/ru/hstrings.php | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'view') diff --git a/view/ru/hstrings.php b/view/ru/hstrings.php index 32266af51..598d02718 100644 --- a/view/ru/hstrings.php +++ b/view/ru/hstrings.php @@ -3252,6 +3252,13 @@ App::$strings["nofed Settings saved."] = "Настройки nofed сохран App::$strings["Allow Federation Toggle"] = "Разрешить переключение федерации"; App::$strings["Federate posts by default"] = "Разрешить федерацию публикаций по умолчанию"; App::$strings["NoFed Settings"] = "Настройки NoFed"; +App::$strings["Your channel has been upgraded to the latest \$Projectname version."] = "Ваш канал был обновлён на последнюю версию \$Projectname."; +App::$strings["To improve usability, we have converted some features into installable stand-alone apps."] = "Чтобы улучшить удобство использования, некоторые функции теперь доступны в виде устанавливаемых автономных приложений."; +App::$strings["Please visit the \$Projectname"] = "Пожалуйста, посетите \$Projectname"; +App::$strings["app store"] = "раздел \"Приложения\""; +App::$strings["and install possibly missing apps."] = "и установите необходимые вам."; +App::$strings["Upgrade Info"] = "Сведения об обновлении"; +App::$strings["Do not show this again"] = "Больше не показывать"; App::$strings["generic profile image"] = "Стандартное изображение профиля"; App::$strings["random geometric pattern"] = "Случайный геометрический рисунок"; App::$strings["monster face"] = "Лицо чудовища"; -- cgit v1.2.3 From a61ce45a32fa07249ee46160fd56ec08e67df601 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 21 Oct 2018 09:10:02 +0200 Subject: fix ellipsis for too long nav banner --- view/css/bootstrap-red.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'view') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index a0b7c5bba..3ae1d152c 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -43,6 +43,11 @@ nav .dropdown-menu { white-space: nowrap; } +/* this fixes ellipsis for too long nav banner */ +#navbar-collapse-1 { + min-width: 0; +} + #navbar-collapse-1 i { font-size: 1.0rem; } -- cgit v1.2.3 From 26e20f99997b061f36c5698035a0b2a7747b4b1a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 22 Oct 2018 14:04:09 +0200 Subject: add summary to bbcode autocomplete list --- view/js/autocomplete.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 54eb03e13..034427fe7 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -358,8 +358,8 @@ function string2bb(element) { return; if(type=='bbcode') { - var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'superscript', 'subscript', 'quote', 'code', 'open', 'spoiler', 'map', 'nobb', 'list', 'checklist', 'ul', 'ol', 'dl', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer', 'observer.language','embed', 'highlight', 'url', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6']; - var open_elements = ['observer.baseurl', 'observer.address', 'observer.photo', 'observer.name', 'observer.webname', 'observer.url', '*', 'hr', ]; + var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'superscript', 'subscript', 'quote', 'code', 'open', 'spoiler', 'summary', 'map', 'nobb', 'list', 'checklist', 'ul', 'ol', 'dl', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer', 'observer.language','embed', 'highlight', 'url', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6']; + var open_elements = ['observer.baseurl', 'observer.address', 'observer.photo', 'observer.name', 'observer.webname', 'observer.url', '*', 'hr' ]; var elements = open_close_elements.concat(open_elements); } -- cgit v1.2.3 From 5c36eef0394b47455b66ad913d157bdd32f8004c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 22 Oct 2018 15:36:02 +0200 Subject: textcomplete: return up to 100 items and look for for matches in the entire string (not just the beginning) when suggesting emojis --- view/js/autocomplete.js | 40 +++++++++++++++++++++++++++------------ view/theme/redbasic/css/style.css | 6 ++++++ 2 files changed, 34 insertions(+), 12 deletions(-) (limited to 'view') diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 034427fe7..aa580b163 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -195,12 +195,12 @@ function string2bb(element) { smilies = { - match: /(^|\s)(:[a-z_:]{2,})$/, + match: /(^|\s)(:[a-z0-9_:]{2,})$/, index: 2, cache: true, - search: function(term, callback) { $.getJSON('/smilies/json').done(function(data) { callback($.map(data, function(entry) { return entry.text.indexOf(term) === 0 ? entry : null; })); }); }, - //template: function(item) { return item.icon + item.text; }, + search: function(term, callback) { $.getJSON('/smilies/json').done(function(data) { callback($.map(data, function(entry) { return entry.text.indexOf(term.substr(1)) !== -1 ? entry : null; })); }); }, replace: function(item) { return "$1" + item.text + ' '; }, + context: function(text) { return text.toLowerCase(); }, template: smiley_format }; this.attr('autocomplete','off'); @@ -209,8 +209,12 @@ function string2bb(element) { $(this).each(function() { var editor = new Textarea(this); - var textcomplete = new Textcomplete(editor); - textcomplete.register([contacts,forums,smilies,tags], {className:'acpopup', zIndex:1020}); + var textcomplete = new Textcomplete(editor, { + dropdown: { + maxCount: 100 + } + }); + textcomplete.register([contacts,forums,smilies,tags]); }); @@ -264,8 +268,12 @@ function string2bb(element) { $(this).each(function() { var editor = new Textarea(this); - textcomplete = new Textcomplete(editor); - textcomplete.register([contacts,forums,tags], {className:'acpopup', maxCount:100, zIndex: 1020, appendTo:'nav'}); + textcomplete = new Textcomplete(editor, { + dropdown: { + maxCount: 100 + } + }); + textcomplete.register([contacts,forums,tags]); }); textcomplete.on('selected', function() { this.editor.el.form.submit(); }); @@ -299,8 +307,12 @@ function string2bb(element) { $(this).each(function() { var editor = new Textarea(this); - textcomplete = new Textcomplete(editor); - textcomplete.register([contacts], {className:'acpopup', zIndex:1020}); + textcomplete = new Textcomplete(editor, { + dropdown: { + maxCount: 100 + } + }); + textcomplete.register([contacts]); }); if(autosubmit) @@ -338,8 +350,12 @@ function string2bb(element) { $(this).each(function() { var editor = new Textarea(this); - textcomplete = new Textcomplete(editor); - textcomplete.register([names], {className:'acpopup', zIndex:1020}); + textcomplete = new Textcomplete(editor, { + dropdown: { + maxCount: 100 + } + }); + textcomplete.register([names]); }); if(autosubmit) @@ -420,7 +436,7 @@ function string2bb(element) { $(this).each(function() { var editor = new Textarea(this); var textcomplete = new Textcomplete(editor); - textcomplete.register([bbco], {className:'acpopup', zIndex:1020}); + textcomplete.register([bbco]); }); this.keypress(function(e){ diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 4f0658477..489d71735 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1474,6 +1474,12 @@ blockquote { background-color: $item_colour; } +.textcomplete-dropdown { + max-height: 300px; + max-width: 250px; + overflow: auto; +} + .dropdown-item.active { color: #fff; background-color: #007bff; -- cgit v1.2.3 From 8b9acf750bde9b21551367f34e57ff549d7d3297 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 24 Oct 2018 20:22:27 +0200 Subject: autocomplete performance: this slightly changes the editor contact autocomplete behaviour. queries using *like* with a prepended % to the query string do not make use of indices. this is no big issue when we query abook but can get really slow when xchan table is involved. this commit changes the xchan table only queries to use the *str%* format. this means that the result set for channels we are not connected with will change in a way that xchan_name and xchan_addr will bematched only from the beginning of the name or address. this commit also changes textcomplete to only start the query after the 3rd character. the result set between 2 and 3 characters is mostly very different and only from 3 chars on there is a high possibility the channel we look for is already in the result. --- view/js/autocomplete.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index aa580b163..6b77f0631 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -163,7 +163,7 @@ function string2bb(element) { // Autocomplete contacts contacts = { - match: /(^|\s)(@\!*)([^ \n]{2,})$/, + match: /(^|\s)(@\!*)([^ \n]{3,})$/, index: 3, cache: true, search: function(term, callback) { contact_search(term, callback, backend_url, 'c', extra_channels, spinelement=false); }, -- cgit v1.2.3 From 5c4fbbebe1bd633e30a907b4a188d04c2f2f4fb0 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 24 Oct 2018 20:58:25 +0200 Subject: refine stream filter and forum notification behaviour (mostly for performance). personal posts will be displayed in unthreaded mode and clicking a forum notification will show only the unseen items of the forum in unthreaded mode. group the filters in the widget - threaded at the top, unthreaded beneath. --- view/tpl/build_query.tpl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view') diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl index 2c55a8140..fcb22b605 100755 --- a/view/tpl/build_query.tpl +++ b/view/tpl/build_query.tpl @@ -31,6 +31,7 @@ var bParam_verb = "{{$verb}}"; var bParam_net = "{{$net}}"; var bParam_pf = "{{$pf}}"; + var bParam_unseen = "{{$unseen}}"; function buildCmd() { var udargs = ((page_load) ? "/load" : ""); @@ -62,6 +63,7 @@ if(bParam_net != "") bCmd = bCmd + "&net=" + bParam_net; if(bParam_page != 1) bCmd = bCmd + "&page=" + bParam_page; if(bParam_pf != 0) bCmd = bCmd + "&pf=" + bParam_pf; + if(bParam_unseen != 0) bCmd = bCmd + "&unseen=" + bParam_unseen; return(bCmd); } -- cgit v1.2.3 From 25c7e64ded56fcd8030cb898ba187be612c7b0f1 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 24 Oct 2018 23:06:32 +0200 Subject: fix get on {1} --- view/tpl/notifications_widget.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 9b3d7487e..f43d82301 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -143,7 +143,7 @@