From be1e5cf98ff68748d0b203c13aace7df2713c46e Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Sat, 18 Sep 2021 11:49:51 +0300 Subject: [PATCH] Locales: Minor corrections and new strings added Added: results, post_as_group, add_signature, contains_nsfw, attach_no_longer_available, open_post, version_incompatibility, all_news, posts_per_page, none --- Web/Presenters/templates/Search/Index.xml | 14 +++++++------- Web/Presenters/templates/User/Edit.xml | 4 ++-- Web/Presenters/templates/Wall/Feed.xml | 6 +++--- .../templates/components/attachment.xml | 8 ++++---- .../templates/components/comments.xml | 2 +- .../templates/components/paginator.xml | 2 +- Web/Presenters/templates/components/wall.xml | 8 ++++---- locales/de.strings | 2 +- locales/en.strings | 18 +++++++++++++++++- locales/ru.strings | 17 +++++++++++++++++ 10 files changed, 57 insertions(+), 24 deletions(-) diff --git a/Web/Presenters/templates/Search/Index.xml b/Web/Presenters/templates/Search/Index.xml index f1a0ad2b..02f59cf5 100644 --- a/Web/Presenters/templates/Search/Index.xml +++ b/Web/Presenters/templates/Search/Index.xml @@ -20,12 +20,12 @@ {block tabs}
- - + +

- {$count} результатов + {tr("results", $count)}

{/block} @@ -36,7 +36,7 @@ {/block} {block preview} - Фотография + {_ {/block} {block name} @@ -49,7 +49,7 @@ {if $type === "users"} {_"gender"}: - {$x->isFemale() ? "женский" : "мужской"} + {$x->isFemale() ? tr("female") : tr("male")} {_"relationship"}: @@ -62,10 +62,10 @@ {/if} - Описание: + {_"description"}: - {$x->getDescription() ?? "(отсутствует)"} + {$x->getDescription() ?? '(' . tr("none") . ')'} diff --git a/Web/Presenters/templates/User/Edit.xml b/Web/Presenters/templates/User/Edit.xml index 9712d728..a61ba5f3 100644 --- a/Web/Presenters/templates/User/Edit.xml +++ b/Web/Presenters/templates/User/Edit.xml @@ -65,7 +65,7 @@ {if OPENVK_ROOT_CONF['openvk']['credentials']['zadarma']['enable']} - Телефон: + {_"phone"}: @@ -132,7 +132,7 @@ - День рождения: + {_"birth_date"}: getBirthday())} type="date"/> diff --git a/Web/Presenters/templates/Wall/Feed.xml b/Web/Presenters/templates/Wall/Feed.xml index 455484a7..4d331832 100644 --- a/Web/Presenters/templates/Wall/Feed.xml +++ b/Web/Presenters/templates/Wall/Feed.xml @@ -7,7 +7,7 @@
- Все новости + {_"all_news"}
@@ -29,7 +29,7 @@
- Прикрепить изображение + {_"attach_photo"}
@@ -45,7 +45,7 @@ {/foreach} {include "../components/paginator.xml", conf => $paginatorConf}
- Количество постов на странице: + {_"posts_per_page"}: От имени сообщества + {_"post_as_group"} {/if} diff --git a/locales/de.strings b/locales/de.strings index 6270b74d..dd7e9703 100644 --- a/locales/de.strings +++ b/locales/de.strings @@ -254,7 +254,7 @@ "main" = "Hauptseite"; "contacts" = "Kontakte"; "avatar" = "Avatar"; -"privacy" = "privatsphäre"; +"privacy" = "Privatsphäre"; "interface" = "oberfläche"; "profile_picture" = "Profilbild"; diff --git a/locales/en.strings b/locales/en.strings index 4fda7939..9061dbb1 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -47,6 +47,7 @@ "status" = "Status"; "no_information_provided" = "No information provided."; "deceased_person" = "Deceased person"; +"none" = "none"; "relationship" = "Relationship"; @@ -115,10 +116,21 @@ "feed" = "News"; "publish_post" = "Add post"; +"all_news" = "All news"; +"posts_per_page" = "Number of posts per page"; + +"attachment" = "Attachment"; +"post_as_group" = "Post as group"; +"add_signature" = "Add signature"; +/* ^ can be translated as "author's signature". ^ */ +"contains_nsfw" = "Contains NSFW content"; "nsfw_warning" = "This post may have NSFW-content"; "report" = "Report"; "attach_photo" = "Attach photo"; "no_posts_abstract" = "Nobody wrote anything here... At least."; +"attach_no_longer_available" = "This attachment is no longer available."; +"open_post" = "Open post"; +"version_incompatibility" = "This attachment could not be displayed. Probably the database is incompatible with the current version of OpenVK."; /* Friends */ @@ -262,7 +274,7 @@ "main" = "Main"; "contacts" = "Contacts"; "avatar" = "Avatar"; -"privacy" = "privacy"; +"privacy" = "Privacy"; "interface" = "Interface"; "profile_picture" = "Profile picture"; @@ -284,6 +296,10 @@ "search_for_groups" = "Search for groups"; "search_for_people" = "Search for people"; "search_button" = "Find"; +"results_zero" = "No results"; +"results_one" = "$1 result"; +"results_other" = "$1 results"; + "privacy_setting_access_page" = "Who can view my page"; "privacy_setting_read_info" = "Who can see main information of my page"; "privacy_setting_see_groups" = "Who can see my groups and meetings"; diff --git a/locales/ru.strings b/locales/ru.strings index 17dcb22c..5cc4fce9 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -44,6 +44,7 @@ "status" = "Статус"; "no_information_provided" = "Информация отсутствует."; "deceased_person" = "Страница покойного человека"; +"none" = "отсутствует"; "years" = "лет"; "relationship" = "Семейное положение"; @@ -114,10 +115,20 @@ "wall_many" = "$1 записей"; "wall_other" = "$1 записей"; +"all_news" = "Все новости"; +"posts_per_page" = "Количество записей на странице"; + +"attachment" = "Вложение"; +"post_as_group" = "От имени сообщества"; +"add_signature" = "Подпись автора"; +"contains_nsfw" = "Содержит NSFW-контент"; "nsfw_warning" = "Данный пост может содержать 18+ контент"; "report" = "Пожаловаться"; "attach_photo" = "Прикрепить фото"; "no_posts_abstract" = "Здесь никто ничего не написал... Пока."; +"attach_no_longer_available" = "Это вложение больше недоступно."; +"open_post" = "Открыть запись"; +"version_incompatibility" = "Не удалось отобразить это вложение. Возможно, база данных несовместима с текущей версией OpenVK."; /* Friends */ @@ -307,6 +318,12 @@ "search_for_groups" = "Поиск групп"; "search_for_people" = "Поиск людей"; "search_button" = "Найти"; +"results_zero" = "Ни одного результата"; +"results_one" = "Один результат"; +"results_few" = "$1 результата"; +"results_many" = "$1 результатов"; +"results_other" = "$1 результатов"; + "privacy_setting_access_page" = "Кому в интернете видно мою страницу"; "privacy_setting_read_info" = "Кому видно основную информацию моей страницы"; "privacy_setting_see_groups" = "Кому видно мои группы и встречи";