diff --git a/Web/Presenters/AboutPresenter.php b/Web/Presenters/AboutPresenter.php index 7952c57f..4c7f916b 100644 --- a/Web/Presenters/AboutPresenter.php +++ b/Web/Presenters/AboutPresenter.php @@ -63,6 +63,7 @@ final class AboutPresenter extends OpenVKPresenter $this->template->languages = getLanguages(); if(!is_null($_GET['lg'])){ + $this->assertNoCSRF(); setLanguage($_GET['lg']); } } diff --git a/Web/Presenters/AuthPresenter.php b/Web/Presenters/AuthPresenter.php index cc34f8d3..4e11f97e 100644 --- a/Web/Presenters/AuthPresenter.php +++ b/Web/Presenters/AuthPresenter.php @@ -182,6 +182,7 @@ final class AuthPresenter extends OpenVKPresenter function renderLogout(): void { $this->assertUserLoggedIn(); + $this->assertNoCSRF(); $this->authenticator->logout(); Session::i()->set("_su", NULL); diff --git a/Web/Presenters/OpenVKPresenter.php b/Web/Presenters/OpenVKPresenter.php index 93675004..3f023385 100755 --- a/Web/Presenters/OpenVKPresenter.php +++ b/Web/Presenters/OpenVKPresenter.php @@ -208,8 +208,8 @@ abstract class OpenVKPresenter extends SimplePresenter } $this->template->ticketAnsweredCount = (new Tickets)->getTicketsCountByuId($this->user->id, 1); - if($user->can("write")->model('openvk\Web\Models\Entities\TicketReply')->whichBelongsTo(0)) - $this->template->helpdeskTicketAnsweredCount = (new Tickets)->getTicketCount(0); + if($user->can("write")->model("openvk\Web\Models\Entities\TicketReply")->whichBelongsTo(0)) + $this->template->helpdeskTicketNotAnsweredCount = (new Tickets)->getTicketCount(0); } setlocale(LC_TIME, ...(explode(";", tr("__locale")))); diff --git a/Web/Presenters/SupportPresenter.php b/Web/Presenters/SupportPresenter.php index ac680ff7..053113c2 100644 --- a/Web/Presenters/SupportPresenter.php +++ b/Web/Presenters/SupportPresenter.php @@ -7,6 +7,7 @@ use openvk\Web\Models\Entities\TicketComment; use openvk\Web\Models\Repositories\TicketComments; // use openvk\Web\Models\Repositories\Users; use openvk\Web\Models\RowModel; +use openvk\Web\Util\Telegram; use Nette\Database\Table\ActiveRow; use Chandler\Database\DatabaseConnection; use Chandler\Session\Session; @@ -52,6 +53,18 @@ final class SupportPresenter extends OpenVKPresenter $ticket->setText($this->postParam("text")); $ticket->setcreated(time()); $ticket->save(); + + $helpdeskChat = OPENVK_ROOT_CONF["openvk"]["credentials"]["telegram"]["helpdeskChat"]; + if($helpdeskChat) { + $serverUrl = ovk_scheme(true) . $_SERVER["SERVER_NAME"]; + $ticketText = ovk_proc_strtr($this->postParam("text"), 1500); + $telegramText = "📬 Новый тикет!\n\n"; + $telegramText .= "{$ticket->getName()}\n"; + $telegramText .= "$ticketText\n\n"; + $telegramText .= "Автор: {$ticket->getUser()->getCanonicalName()} ({$ticket->getUser()->getRegistrationIP()})\n"; + Telegram::send($helpdeskChat, $telegramText); + } + header("HTTP/1.1 302 Found"); header("Location: /support/view/" . $ticket->getId()); } else { diff --git a/Web/Presenters/UserPresenter.php b/Web/Presenters/UserPresenter.php index 2edea129..bef3812f 100644 --- a/Web/Presenters/UserPresenter.php +++ b/Web/Presenters/UserPresenter.php @@ -142,7 +142,7 @@ final class UserPresenter extends OpenVKPresenter if ($this->postParam("marialstatus") <= 8 && $this->postParam("marialstatus") >= 0) $user->setMarital_Status($this->postParam("marialstatus")); - if ($this->postParam("politViews") <= 8 && $this->postParam("politViews") >= 0) + if ($this->postParam("politViews") <= 9 && $this->postParam("politViews") >= 0) $user->setPolit_Views($this->postParam("politViews")); if ($this->postParam("gender") <= 1 && $this->postParam("gender") >= 0) diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml index a1cd39aa..ad47f7f4 100644 --- a/Web/Presenters/templates/@layout.xml +++ b/Web/Presenters/templates/@layout.xml @@ -108,7 +108,7 @@
- {_"header_log_out"} + {_"header_log_out"}
@@ -173,8 +173,8 @@ {/if} {if $canAccessHelpdesk} Helpdesk - {if $helpdeskTicketAnsweredCount > 0} - ({$helpdeskTicketAnsweredCount}) + {if $helpdeskTicketNotAnsweredCount > 0} + ({$helpdeskTicketNotAnsweredCount}) {/if} {/if} diff --git a/Web/Presenters/templates/About/Language.xml b/Web/Presenters/templates/About/Language.xml index 121452f0..de9aed87 100644 --- a/Web/Presenters/templates/About/Language.xml +++ b/Web/Presenters/templates/About/Language.xml @@ -8,7 +8,7 @@ {block content}
{foreach $languages as $language} - {$language['native_name']} + {$language['native_name']} {/foreach}
{/block} diff --git a/Web/Presenters/templates/User/Settings.xml b/Web/Presenters/templates/User/Settings.xml index 20ba7420..a3eb8ad0 100644 --- a/Web/Presenters/templates/User/Settings.xml +++ b/Web/Presenters/templates/User/Settings.xml @@ -211,7 +211,7 @@ - + @@ -224,7 +224,7 @@ - + @@ -237,7 +237,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -263,7 +263,7 @@ - + @@ -276,7 +276,7 @@ - + @@ -289,7 +289,7 @@ - + @@ -300,7 +300,7 @@ @@ -312,7 +312,7 @@ diff --git a/Web/Util/Telegram.php b/Web/Util/Telegram.php new file mode 100644 index 00000000..4c76ce2b --- /dev/null +++ b/Web/Util/Telegram.php @@ -0,0 +1,34 @@ +enable) + return false; + + try { + (new GuzzleClient)->request( + "POST", + "https://api.telegram.org/bot{$conf->token}/sendMessage", + [ + "form_params" => [ + "chat_id" => $to, + "text" => $text, + "disable_web_page_preview" => $webPagePreview ? "true" : "false", + "parse_mode" => "HTML", + ] + ] + ); + } catch (GuzzleClientException $ex) { + trigger_error("Could not send Telegram message to $to: {$ex->getMessage()}", E_USER_WARNING); + return false; + } + + return true; + } +} diff --git a/locales/am.strings b/locales/am.strings index c9020d52..a0c190fb 100644 --- a/locales/am.strings +++ b/locales/am.strings @@ -137,9 +137,6 @@ "friends" = "Ընկերներ"; "followers" = "Բաժանորդներ"; "follower" = "Բաժանորդ"; -"login_as" = "Մուտք գործել ինչպես"; -"ban_fast" = "Բլոկավորել"; -"adm_notify" = "Զգուշացնել"; "friends_add" = "Ավելացնել դեպի ընկերներ"; "friends_delete" = "Հեռացնել ընկերներից"; "friends_reject" = "Չեղարկել հայտը"; @@ -358,9 +355,9 @@ "privacy_value_users" = "OpenVK–ի օգտատերերին"; "privacy_value_friends" = "Ընկերներ"; "privacy_value_friends_dative" = "Ընկերներին"; -"privacy_value_only_me_and_super_capite" = "Ինձ և Կառլեն Դանիելյանին"; -"privacy_value_only_me_and_super_capite_dative" = "Ինձ և Կառլեն Դանիելյանին"; -"privacy_value_super_capite" = "Կառլեն Դանիելյանին"; +"privacy_value_only_me" = "Միայն ես"; +"privacy_value_only_me_dative" = "Միայն ինձ"; +"privacy_value_nobody" = "Ոչ ոք"; "your_email_address" = "Ձեր էլեկտրոնային հասցեն"; "your_page_address" = "Ձեր էջի հասցեն"; @@ -442,24 +439,6 @@ "time_today" = "այսօր"; "time_yesterday" = "երեկ"; -"privacy_setting_access_page" = "Ով կարող է տեսնել ինտերնետում իմ էջը"; -"privacy_setting_read_info" = "Ում է տեսանելի իմ էջի հիմնական ինֆորմացիան"; -"privacy_setting_see_groups" = "Ով կարող է տեսնել իմ խմբերը և հանդիպումները"; -"privacy_setting_see_photos" = "Ով կարող է տեսնել իմ նկարները"; -"privacy_setting_see_videos" = "Ով կարող է տեսնել իմ տեսանյութերը"; -"privacy_setting_see_notes" = "Ում են երևում իմ նշումները"; -"privacy_setting_see_friends" = "Ում են երևում իմ ընկերները"; -"privacy_setting_add_to_friends" = "Ով կարող է ինձ ընկեր կոչել"; -"privacy_setting_write_wall" = "Ով կարող է գրել իմ պատին"; -"privacy_value_anybody" = "Բոլոր ցանկացողները"; -"privacy_value_anybody_dative" = "Բոլոր ցանկացողներին"; -"privacy_value_users" = "OpenVK–ի օգտատերերին"; -"privacy_value_friends" = "Ընկերներ"; -"privacy_value_friends_dative" = "Ընկերներին"; -"privacy_value_only_me_and_super_capite" = "Միայն ես"; -"privacy_value_only_me_and_super_capite_dative" = "Միայն ինձ"; -"privacy_value_super_capite" = "Ոչ ոք"; - "your_email_address" = "Ձեր էլեկտրոնային հասցեն"; "your_page_address" = "Ձեր էջի հասցեն"; "page_address" = "Էջի հասցեն"; diff --git a/locales/by.strings b/locales/by.strings index 54901b39..65e44588 100644 --- a/locales/by.strings +++ b/locales/by.strings @@ -287,6 +287,7 @@ "search_for_groups" = "Пошук груп"; "search_for_people" = "Пошук людзей"; "search_button" = "Знайсці"; + "privacy_setting_access_page" = "Каму ў інтэрнэце відаць маю старонку"; "privacy_setting_read_info" = "Каму відаць асноўную інфармацыю маёй старонкі"; "privacy_setting_see_groups" = "Каму відаць мае суполкі і сустрэчы"; @@ -301,9 +302,9 @@ "privacy_value_users" = "Карыстальнікам OpenVK"; "privacy_value_friends" = "Сябры"; "privacy_value_friends_dative" = "Сябрам"; -"privacy_value_only_me_and_super_capite" = "Я і Даніілу Мысліўцу"; -"privacy_value_only_me_and_super_capite_dative" = "Мне і Даніілу Мысліўцу"; -"privacy_value_super_capite" = "Даніілу Мысліўцу"; +"privacy_value_only_me" = "Толькі я"; +"privacy_value_only_me_dative" = "Толькі мне"; +"privacy_value_nobody" = "Ніхто"; "your_email_address" = "Адрас Вашай электроннай пошты"; "your_page_address" = "Адрас Вашай старонкі"; @@ -386,24 +387,6 @@ "Time_today" = "сёння"; "Time_yesterday" = "учора"; -"privacy_setting_access_page" = "Каму ў інтэрнэце відаць маю старонку"; -"privacy_setting_read_info" = "Каму відаць асноўную інфармацыю маёй старонкі"; -"privacy_setting_see_groups" = "Каму відаць мае суполкі і сустрэчы"; -"privacy_setting_see_photos" = "Каму відаць мае фатаграфіі"; -"privacy_setting_see_videos" = "Каму відаць мае відэазапісы"; -"privacy_setting_see_notes" = "Каму відаць мае нататкі"; -"privacy_setting_see_friends" = "Каму відаць маіх сяброў"; -"privacy_setting_add_to_friends" = "Хто можа называць мяне сябрам"; -"privacy_setting_write_wall" = "Хто можа пісаць у мяне на сцяне"; -"privacy_value_anybody" = "Усе жадаючыя"; -"privacy_value_anybody_dative" = "Усім жадаючым"; -"privacy_value_users" = "Карыстальнікам OpenVK"; -"privacy_value_friends" = "Сябры"; -"privacy_value_friends_dative" = "Сябрам"; -"privacy_value_only_me_and_super_capite" = "Я і Даніілу Мысліўцу"; -"privacy_value_only_me_and_super_capite_dative" = "Мне і Даніілу Мысліўцу"; -"privacy_value_super_capite" = "Даніілу Мысліўцу"; - "your_email_address" = "Адрас Вашай электроннай пошты"; "your_page_address" = "Адрас Вашай старонкі"; "page_address" = "Адрас старонкі"; diff --git a/locales/by_lat.strings b/locales/by_lat.strings index a48d3f92..9b77c312 100644 --- a/locales/by_lat.strings +++ b/locales/by_lat.strings @@ -121,9 +121,6 @@ "friends" = "Siabry"; "followers" = "Padpisanty"; "follower" = "Padpisant"; -"login_as" = "Uvajści jak"; -"ban_fast" = "Zabanić"; -"adm_notify" = "Papiaredzić"; "friends_add" = "Dadać da siabroŭ"; "friends_delete" = "Vydalić ź siabroŭ"; "friends_reject" = "Adchilić zajavu"; @@ -298,6 +295,7 @@ "search_for_groups" = "Pošuk hurtoŭ"; "search_for_people" = "Pošuk ludziaŭ"; "search_button" = "Znajści"; + "privacy_setting_access_page" = "Kamu ŭ interniecie vidać maju staronku"; "privacy_setting_read_info" = "Kamu vidać asnoŭnuju infarmacyju majoj staronki"; "privacy_setting_see_groups" = "Kamu vidać maje hurty j sustrečy"; @@ -312,9 +310,9 @@ "privacy_value_users" = "Karystalnikam OpenVK"; "privacy_value_friends" = "Siabry"; "privacy_value_friends_dative" = "Siabram"; -"privacy_value_only_me_and_super_capite" = "Ja j Jahor Praŭdzikaŭ"; -"privacy_value_only_me_and_super_capite_dative" = "Mianie j Jahoru Praŭdzikavu"; -"privacy_value_super_capite" = "Jahoru Praŭdzikavu"; +"privacy_value_only_me" = "Tolki ja"; +"privacy_value_only_me_dative" = "Tolki mnie"; +"privacy_value_nobody" = "Nichto"; "your_email_address" = "Adras Vašaj elektronaj pošty"; "your_page_address" = "Adras Vašaj staronki"; @@ -396,24 +394,6 @@ "time_today" = "siońnia"; "time_yesterday" = "učora"; -"privacy_setting_access_page" = "Kamu ŭ interniecie vidać maju staronku"; -"privacy_setting_read_info" = "Kamu vidać asnoŭnuju infarmacyju majoj staronki"; -"privacy_setting_see_groups" = "Kamu vidać maje hurty j sustrečy"; -"privacy_setting_see_photos" = "Kamu vidać maje fotazdymki"; -"privacy_setting_see_videos" = "Kamu vidać maje videazapisy"; -"privacy_setting_see_notes" = "Kamu vidać maje natatki"; -"privacy_setting_see_friends" = "Kamu vidać maich siabroŭ"; -"privacy_setting_add_to_friends" = "Chto moža nazyvać mianie siabram"; -"privacy_setting_write_wall" = "Chto moža pisać u mianie na ścianie"; -"privacy_value_anybody" = "Usie žadajučyja"; -"privacy_value_anybody_dative" = "Usim žadajučym"; -"privacy_value_users" = "Karystalnikam OpenVK"; -"privacy_value_friends" = "Siabry"; -"privacy_value_friends_dative" = "Siabram"; -"privacy_value_only_me_and_super_capite" = "Tolki ja"; -"privacy_value_only_me_and_super_capite_dative" = "Tolki mnie"; -"privacy_value_super_capite" = "Nichto"; - "your_email_address" = "Adras Vašaj elektronaj pošty"; "your_page_address" = "Adras Vašaj staronki"; "page_address" = "Adras staronki"; diff --git a/locales/de.strings b/locales/de.strings index 1d2001c6..ad7e5614 100644 --- a/locales/de.strings +++ b/locales/de.strings @@ -335,6 +335,7 @@ "privacy_value_friends_dative" = "Freunde"; "privacy_value_only_me" = "Nur ich"; "privacy_value_only_me_dative" = "Nur ich"; +"privacy_value_nobody" = "Niemand"; "your_email_address" = "Deine E-Mail-Adresse"; "your_page_address" = "Deine Profil-URL"; diff --git a/locales/en.strings b/locales/en.strings index 4619f1c1..7536d8f4 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -36,20 +36,20 @@ "nickname" = "Nickname"; "online" = "Online"; "was_online" = "was online"; -"was_online_m" = "was online"; -/* For male and female */ - -"years_zero" = "0 year old"; -"years_one" = "1 year old"; -"years_other" = "$1 years old"; - +"was_online_m" = "was online"; "was_online_f" = "was online"; +/* For male and female */ "all_title" = "All"; "information" = "Information"; "status" = "Status"; "no_information_provided" = "No information provided."; "deceased_person" = "Deceased person"; "none" = "none"; +"send" = "Send"; + +"years_zero" = "0 year old"; +"years_one" = "1 year old"; +"years_other" = "$1 years old"; "relationship" = "Relationship"; @@ -99,8 +99,11 @@ /* Wall */ +"feed" = "News"; + "post_writes_m" = "wrote"; "post_writes_f" = "wrote"; +"post_writes_g" = "published"; "wall" = "Wall"; "post" = "Post"; "write" = "Write"; @@ -118,7 +121,6 @@ "wall_zero" = "no posts"; "wall_one" = "$1 post"; "wall_other" = "$1 posts"; -"feed" = "News"; "publish_post" = "Add post"; "view_other_comments" = "View other comments"; @@ -287,7 +289,6 @@ "header_login" = "login"; "header_registration" = "registration"; -"header_help" = "help"; "footer_blog" = "blog"; "footer_help" = "help"; @@ -342,6 +343,7 @@ "privacy_value_friends_dative" = "Friends"; "privacy_value_only_me" = "Only me"; "privacy_value_only_me_dative" = "Only me"; +"privacy_value_nobody" = "Nobody"; "your_email_address" = "Your Email address"; "your_page_address" = "Your address page"; @@ -402,7 +404,7 @@ "upload_video" = "Upload video"; "video_uploaded" = "Uploaded"; "video_updated" = "Updated"; -"video_link_to_yt" = "YT link"; +"video_link_to_yt" = "Link to YouTube"; "info_name" = "Title"; "info_description" = "Description"; @@ -452,6 +454,10 @@ "time_today" = "today"; "time_yesterday" = "yesterday"; +"points" = "Votes"; +"points_count" = "votes"; +"on_your_account" = "on your account"; + "vouchers" = "Vouchers"; "have_voucher" = "Have voucher"; "voucher_token" = "Voucher token"; @@ -488,10 +494,10 @@ "gift_your_message" = "Your message"; "free_gift" = "Free"; -"coins" = "Voices"; -"coins_zero" = "0 voices"; -"coins_one" = "One voice"; -"coins_other" = "$1 voices"; +"coins" = "Votes"; +"coins_zero" = "0 vote"; +"coins_one" = "One vote"; +"coins_other" = "$1 votes"; "users_gifts" = "Gifts"; diff --git a/locales/kk.strings b/locales/kk.strings index 1091fbe5..fe75a9ac 100644 --- a/locales/kk.strings +++ b/locales/kk.strings @@ -147,9 +147,6 @@ "followers" = "Жазылмандар"; "follower" = "Жазылман"; "login_as" = "Кім ретінде кіру:"; -"ban_fast" = "Блоктау"; -"adm_notify" = "Ескерту"; -"friends_add" = "Достарыма қосу"; "friends_delete" = "Достарымнан жою"; "friends_reject" = "Өтінімді қабылдамау"; "friends_accept" = "Өтінімді қабылдау"; @@ -421,9 +418,9 @@ "privacy_value_users" = "OpenVK қолданушылары"; "privacy_value_friends" = "Достарым"; "privacy_value_friends_dative" = "Достарым"; -"privacy_value_only_me_and_super_capite" = "Мен ғана"; -"privacy_value_only_me_and_super_capite_dative" = "Мен ғана"; -"privacy_value_super_capite" = "Ешкім"; +"privacy_value_only_me" = "Мен ғана"; +"privacy_value_only_me_dative" = "Мен ғана"; +"privacy_value_nobody" = "Ешкім"; "points" = "Дауыс"; "points_count" = "дауыс"; diff --git a/locales/pl.strings b/locales/pl.strings index 06515c84..4c236bc1 100644 --- a/locales/pl.strings +++ b/locales/pl.strings @@ -140,9 +140,6 @@ "friends" = "Przyjaciel"; "followers" = "Subskrybent"; "follower" = "Subskrybent"; -"login_as" = "Zaloguj się jako"; -"ban_fast" = "Zablokować"; -"adm_notify" = "Ostrzec"; "friends_add" = "Dodaj do znajomych"; "friends_delete" = "Usuń z znajomych"; "friends_reject" = "Anuluj wniosek"; @@ -347,7 +344,7 @@ "results_many" = "$1 wyniki"; "results_other" = "$1 wyników"; -"privacy_setting_access_page" = "Kto w internecie widzi moją stronę"; +"privacy_setting_access_page" = "Kto w Internecie widzi moją stronę"; "privacy_setting_read_info" = "Kto widzi podstawowe informacje o mojej stronie"; "privacy_setting_see_groups" = "Kto widzi moje grupy i spotkania"; "privacy_setting_see_photos" = "Kto widzi moje zdjęcia"; @@ -361,9 +358,9 @@ "privacy_value_users" = "Przez użytkownika OpenVK"; "privacy_value_friends" = "Przyjaciel"; "privacy_value_friends_dative" = "Przyjaciel"; -"privacy_value_only_me_and_super_capite" = "Ja i Witalina Pawlenko"; -"privacy_value_only_me_and_super_capite_dative" = "Ja i Witalinie Pawlenko"; -"privacy_value_super_capite" = "Witalinie Pawlenko"; +"privacy_value_only_me" = "Tylko ja"; +"privacy_value_only_me_dative" = "Tylko mnie"; +"privacy_value_nobody" = "Nikt"; "your_email_address" = "Twój adres e-mail"; "your_page_address" = "Adres Twojej strony"; @@ -445,24 +442,6 @@ "time_today" = "dziś"; "time_yesterday" = "wczo"; -"privacy_setting_access_page" = "Kto w Internecie widzi moją stronę"; -"privacy_setting_read_info" = "Kto widzi podstawowe informacje o mojej stronie"; -"privacy_setting_see_groups" = "Kto widzi moje grupy i spotkania"; -"privacy_setting_see_photos" = "Kto widzi moje zdjęcia"; -"privacy_setting_see_videos" = "Kto widzi moje nagrania"; -"privacy_setting_see_notes" = "Kto widzi moje notatki"; -"privacy_setting_see_friends" = "Kto widzi moich przyjaciół"; -"privacy_setting_add_to_friends" = "Kto może nazywać mnie przyjacielem"; -"privacy_setting_write_wall" = "Kto może pisać na mojej ścianie"; -"privacy_value_anybody" = "Wszyscy chętni"; -"privacy_value_anybody_dative" = "Wszystkim chętnym"; -"privacy_value_users" = "Przez użytkownika OpenVK"; -"privacy_value_friends" = "Przyjaciel"; -"privacy_value_friends_dative" = "Przyjaciel"; -"privacy_value_only_me_and_super_capite" = "Tylko ja"; -"privacy_value_only_me_and_super_capite_dative" = "Tylko mnie"; -"privacy_value_super_capite" = "Nikt"; - "your_email_address" = "Twój adres e-mail"; "your_page_address" = "Adres Twojej strony"; "page_address" = "Adres strony"; diff --git a/locales/ru.strings b/locales/ru.strings index 0109646b..f657d5da 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -101,6 +101,8 @@ /* Wall */ +"feed" = "Новости"; + "post_writes_m" = "написал"; "post_writes_f" = "написала"; "post_writes_g" = "опубликовали"; @@ -123,6 +125,7 @@ "wall_few" = "$1 записи"; "wall_many" = "$1 записей"; "wall_other" = "$1 записей"; +"publish_post" = "Добавить запись"; "view_other_comments" = "Посмотреть остальные комментарии"; "no_comments" = "Комментарии отсутствуют"; @@ -148,9 +151,6 @@ "friends" = "Друзья"; "followers" = "Подписчики"; "follower" = "Подписчик"; -"login_as" = "Войти как"; -"ban_fast" = "Забанить"; -"adm_notify" = "Предупредить"; "friends_add" = "Добавить в друзья"; "friends_delete" = "Удалить из друзей"; "friends_reject" = "Отменить заявку"; @@ -270,8 +270,6 @@ "text_note" = "Содержание"; "create_note" = "Создать заметку"; "actions" = "Действия"; -"feed" = "Новости"; -"publish_post" = "Добавить запись"; "notes_zero" = "Ни одной заметки"; "notes_one" = "Одна заметка"; @@ -316,12 +314,6 @@ "footer_choose_language" = "выбрать язык"; "footer_privacy" = "приватность"; -"notes_zero" = "Ни одной заметки"; -"notes_one" = "Одна заметка"; -"notes_few" = "$1 заметки"; -"notes_many" = "$1 заметок"; -"notes_other" = "$1 заметок"; - /* Settings */ "main" = "Основное"; @@ -369,9 +361,9 @@ "privacy_value_users" = "Пользователям OpenVK"; "privacy_value_friends" = "Друзья"; "privacy_value_friends_dative" = "Друзьям"; -"privacy_value_only_me_and_super_capite" = "Я и Виталина Павленко"; -"privacy_value_only_me_and_super_capite_dative" = "Мне и Виталине Павленко"; -"privacy_value_super_capite" = "Виталине Павленко"; +"privacy_value_only_me" = "Только я"; +"privacy_value_only_me_dative" = "Только мне"; +"privacy_value_nobody" = "Никто"; "your_email_address" = "Адрес Вашей электронной почты"; "your_page_address" = "Адрес Вашей страницы"; @@ -419,7 +411,7 @@ /* Sorting */ -"sort_randomly" = "Сортировать рандомно"; +"sort_randomly" = "Сортировать случайно"; "sort_up" = "Сортировать по дате создания вверх"; "sort_down" = "Сортировать по дате создания вниз"; @@ -430,7 +422,7 @@ "upload_video" = "Загрузить видео"; "video_uploaded" = "Загружено"; "video_updated" = "Обновлено"; -"video_link_to_yt" = "Ссылка на YT"; +"video_link_to_yt" = "Ссылка на YouTube"; "info_name" = "Название"; "info_description" = "Описание"; @@ -482,39 +474,6 @@ "time_today" = "сегодня"; "time_yesterday" = "вчера"; -"privacy_setting_access_page" = "Кому в интернете видно мою страницу"; -"privacy_setting_read_info" = "Кому видно основную информацию моей страницы"; -"privacy_setting_see_groups" = "Кому видно мои группы и встречи"; -"privacy_setting_see_photos" = "Кому видно мои фотографии"; -"privacy_setting_see_videos" = "Кому видно мои видеозаписи"; -"privacy_setting_see_notes" = "Кому видно мои заметки"; -"privacy_setting_see_friends" = "Кому видно моих друзей"; -"privacy_setting_add_to_friends" = "Кто может называть меня другом"; -"privacy_setting_write_wall" = "Кто может писать у меня на стене"; -"privacy_value_anybody" = "Все желающие"; -"privacy_value_anybody_dative" = "Всем желающим"; -"privacy_value_users" = "Пользователям OpenVK"; -"privacy_value_friends" = "Друзья"; -"privacy_value_friends_dative" = "Друзьям"; -"privacy_value_only_me_and_super_capite" = "Только я"; -"privacy_value_only_me_and_super_capite_dative" = "Только мне"; -"privacy_value_super_capite" = "Никто"; - -"your_email_address" = "Адрес Вашей электронной почты"; -"your_page_address" = "Адрес Вашей страницы"; -"page_address" = "Адрес страницы"; -"current_email_address" = "Текущий адрес"; -"page_id" = "ID страницы"; -"you_can_also" = "Вы также можете"; -"delete_your_page" = "удалить свою страницу"; -"delete_album" = "удалить альбом"; - -"ui_settings_interface" = "Интерфейс"; -"ui_settings_sidebar" = "Левое меню"; -"ui_settings_rating" = "Рейтинг"; -"ui_settings_rating_show" = "Показывать"; -"ui_settings_rating_hide" = "Скрывать"; - "points" = "Голоса"; "points_count" = "голосов"; "on_your_account" = "на вашем счету"; diff --git a/locales/sr_cyr.strings b/locales/sr_cyr.strings index 5331e32d..a25ab905 100644 --- a/locales/sr_cyr.strings +++ b/locales/sr_cyr.strings @@ -287,6 +287,7 @@ "search_for_groups" = "Истраживање група"; "search_for_people" = "Истраживање људи"; "search_button" = "Пронаћи"; + "privacy_setting_access_page" = "Ко може видјети моју страницу на Интернету"; "privacy_setting_read_info" = "Ко може видјети основну информацију од моје странице"; "privacy_setting_see_groups" = "Ко може видјети информацију о мојим груповима и састанку"; @@ -301,9 +302,9 @@ "privacy_value_users" = "Корисници OpenVK"; "privacy_value_friends" = "Пријатеље"; "privacy_value_friends_dative" = "Пријатеље"; -"privacy_value_only_me_and_super_capite" = "Ја сам и Виталина Павленко"; -"privacy_value_only_me_and_super_capite_dative" = "За мене и Виталину Павленко"; -"privacy_value_super_capite" = "Виталини Павленко"; +"privacy_value_only_me" = "Ја сам"; +"privacy_value_only_me_dative" = "За мене"; +"privacy_value_nobody" = "Нико"; "your_email_address" = "Ваша e-mail адреса"; "your_page_address" = "Адреса Ваше странице"; @@ -385,23 +386,6 @@ "time_today" = "данас"; "time_yesterday" = "јуће"; -"privacy_setting_access_page" = "Ко може видјети моју страницу на Интернету"; -"privacy_setting_read_info" = "Ко може видјети основну информацију од моје странице"; -"privacy_setting_see_groups" = "Ко може видјети информацију о мојим груповима и састанку"; -"privacy_setting_see_photos" = "Ко може видјети моје слике"; -"privacy_setting_see_videos" = "Ко може погледати моје видео"; -"privacy_setting_see_notes" = "Ко може видјети моје билешке"; -"privacy_setting_see_friends" = "Ко може да упозна са мојим пријатељима"; -"privacy_setting_add_to_friends" = "Ко има могућност да дода ме у пријатеље"; -"privacy_setting_write_wall" = "Ко има могућност да пиши на мојем зиду"; -"privacy_value_anybody" = "Било ко"; -"privacy_value_anybody_dative" = "Било ко"; -"privacy_value_users" = "Корисници OpenVK"; -"privacy_value_friends" = "Пријатеље"; -"privacy_value_friends_dative" = "Пријатеље"; -"privacy_value_only_me_and_super_capite" = "Ја сам"; -"privacy_value_only_me_and_super_capite_dative" = "За мене"; - "your_email_address" = "Адреса Ваше електронске поште"; "your_page_address" = "Адреса Ваше странице"; "page_address" = "Адреса странице"; diff --git a/locales/sr_lat.strings b/locales/sr_lat.strings index be3ea0f4..c34cd3fb 100644 --- a/locales/sr_lat.strings +++ b/locales/sr_lat.strings @@ -287,6 +287,7 @@ "search_for_groups" = "Istraživanje grupa"; "search_for_people" = "Istraživanje ljudi"; "search_button" = "Pronaći"; + "privacy_setting_access_page" = "Ko može videti moju stranicu na Internetu"; "privacy_setting_read_info" = "Ko može videti osnovnu informaciju od moje stranice"; "privacy_setting_see_groups" = "Ko može videti informaciju o mojim grupovima i sastanku"; @@ -301,9 +302,9 @@ "privacy_value_users" = "Korisnici OpenVK"; "privacy_value_friends" = "Prijatelje"; "privacy_value_friends_dative" = "Prijatelje"; -"privacy_value_only_me_and_super_capite" = "Ja sam i Vitalina Pavlenko"; -"privacy_value_only_me_and_super_capite_dative" = "Za mene i Vitalinu Pavlenko"; -"privacy_value_super_capite" = "Vitalini Pavlenko"; +"privacy_value_only_me" = "Ja sam"; +"privacy_value_only_me_dative" = "Za mene"; +"privacy_value_nobody" = "Niko"; "your_email_address" = "Vaša e-mail adresa"; "your_page_address" = "Adresa Vaše stranice"; @@ -385,23 +386,6 @@ "time_today" = "danas"; "time_yesterday" = "juće"; -"privacy_setting_access_page" = "Ko može videti moju stranicu na Internetu"; -"privacy_setting_read_info" = "Ko može videti osnovnu informaciju od moje stranice"; -"privacy_setting_see_groups" = "Ko može videti informaciju o mojim grupovima i sastanku"; -"privacy_setting_see_photos" = "Ko može videti moje slike"; -"privacy_setting_see_videos" = "Ko može pogledati moje video"; -"privacy_setting_see_notes" = "Ko može videti moje bile?ke"; -"privacy_setting_see_friends" = "Ko može da upozna sa mojim prijateljima"; -"privacy_setting_add_to_friends" = "Ko ima mogućnost da doda me u prijatelje"; -"privacy_setting_write_wall" = "Ko ima mogućnost da piši na mojem zidu"; -"privacy_value_anybody" = "Bilo ko"; -"privacy_value_anybody_dative" = "Bilo ko"; -"privacy_value_users" = "Korisnici OpenVK"; -"privacy_value_friends" = "Prijatelje"; -"privacy_value_friends_dative" = "Prijatelje"; -"privacy_value_only_me_and_super_capite" = "Ja sam"; -"privacy_value_only_me_and_super_capite_dative" = "Za mene"; - "your_email_address" = "Adresa Vaše elektronske pošte"; "your_page_address" = "Adresa Vaše stranice"; "page_address" = "Adresa stranice"; diff --git a/locales/tr.strings b/locales/tr.strings index edbaede4..35648294 100644 --- a/locales/tr.strings +++ b/locales/tr.strings @@ -330,6 +330,7 @@ "privacy_value_friends_dative" = "Arkadaşlarım"; "privacy_value_only_me" = "Sadece ben"; "privacy_value_only_me_dative" = "Sadece ben"; +"privacy_value_nobody" = "Kimse"; "your_email_address" = "E-posta adresin"; "your_page_address" = "Adres sayfan"; diff --git a/locales/ua.strings b/locales/ua.strings index a48bb352..8fb8830e 100644 --- a/locales/ua.strings +++ b/locales/ua.strings @@ -147,9 +147,6 @@ "friends" = "Друзі"; "followers" = "Підписники"; "follower" = "Підписник"; -"login_as" = "Увійти як"; -"ban_fast" = "Заблокувати"; -"adm_notify" = "Попередити"; "friends_add" = "Додати в друзі"; "friends_delete" = "Видалити з друзів"; "friends_reject" = "Скасувати заявку"; @@ -466,9 +463,9 @@ "privacy_value_users" = "Користувачам OpenVK"; "privacy_value_friends" = "Друзі"; "privacy_value_friends_dative" = "Друзям"; -"privacy_value_only_me_and_super_capite" = "Тільки я"; -"privacy_value_only_me_and_super_capite_dative" = "Тільки мені"; -"privacy_value_super_capite" = "Ніхто"; +"privacy_value_only_me" = "Тільки я"; +"privacy_value_only_me_dative" = "Тільки мені"; +"privacy_value_nobody" = "Ніхто"; "your_email_address" = "Адрес Вашої електронної пошти"; "your_page_address" = "Адрес Вашої сторінки"; diff --git a/openvk-example.yml b/openvk-example.yml index f2552319..2bb61e81 100644 --- a/openvk-example.yml +++ b/openvk-example.yml @@ -65,6 +65,10 @@ openvk: enable: false client: "" secret: "SECRET_KEY_HERE" + telegram: + enable: false + token: "TOKEN_HERE" + helpdeskChat: "" eventDB: enable: false # Better enable this database: