From bbdfb04c01d17c054d03575ee47cd70e75820d93 Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Tue, 9 Aug 2022 13:37:08 +0700 Subject: [PATCH] {_"(.*)"} -> {_(.*)} --- .../templates/@MilkshakeListView.xml | 6 +- Web/Presenters/templates/@banned.xml | 6 +- Web/Presenters/templates/About/Index.xml | 8 +- Web/Presenters/templates/About/Invite.xml | 4 +- Web/Presenters/templates/About/Language.xml | 4 +- .../Auth/FinishRestoringPassword.xml | 10 +- Web/Presenters/templates/Auth/Login.xml | 12 +-- .../templates/Auth/LoginSecondFactor.xml | 8 +- Web/Presenters/templates/Auth/Register.xml | 28 ++--- Web/Presenters/templates/Auth/Restore.xml | 10 +- Web/Presenters/templates/Group/Admin.xml | 6 +- Web/Presenters/templates/Group/Create.xml | 12 +-- Web/Presenters/templates/Group/Edit.xml | 6 +- Web/Presenters/templates/Group/Followers.xml | 4 +- Web/Presenters/templates/Group/View.xml | 34 +++--- Web/Presenters/templates/Photos/Album.xml | 8 +- Web/Presenters/templates/Photos/AlbumList.xml | 2 +- .../templates/Photos/CreateAlbum.xml | 16 +-- Web/Presenters/templates/Photos/EditAlbum.xml | 12 +-- Web/Presenters/templates/Photos/EditPhoto.xml | 6 +- Web/Presenters/templates/Photos/Photo.xml | 24 ++--- .../templates/Photos/UploadPhoto.xml | 10 +- Web/Presenters/templates/Search/Index.xml | 10 +- Web/Presenters/templates/Support/Index.xml | 2 +- Web/Presenters/templates/Topics/Board.xml | 4 +- Web/Presenters/templates/User/Edit.xml | 100 +++++++++--------- Web/Presenters/templates/User/Friends.xml | 32 +++--- Web/Presenters/templates/User/Groups.xml | 2 +- Web/Presenters/templates/User/Settings.xml | 40 +++---- .../templates/User/TwoFactorAuthCodes.xml | 12 +-- .../templates/User/TwoFactorAuthSettings.xml | 10 +- Web/Presenters/templates/User/View.xml | 78 +++++++------- Web/Presenters/templates/User/banned.xml | 2 +- Web/Presenters/templates/Videos/Edit.xml | 10 +- Web/Presenters/templates/Videos/List.xml | 10 +- Web/Presenters/templates/Videos/Upload.xml | 18 ++-- Web/Presenters/templates/Videos/View.xml | 16 +-- Web/Presenters/templates/Wall/Feed.xml | 6 +- Web/Presenters/templates/Wall/Post.xml | 4 +- Web/Presenters/templates/Wall/Wall.xml | 4 +- 40 files changed, 298 insertions(+), 298 deletions(-) diff --git a/Web/Presenters/templates/@MilkshakeListView.xml b/Web/Presenters/templates/@MilkshakeListView.xml index 31e366fa..699da82b 100644 --- a/Web/Presenters/templates/@MilkshakeListView.xml +++ b/Web/Presenters/templates/@MilkshakeListView.xml @@ -52,9 +52,9 @@ {include actions}
- {_"sort_randomly"} - {_"sort_up"} - {_"sort_down"} + {_sort_randomly} + {_sort_up} + {_sort_down}
diff --git a/Web/Presenters/templates/@banned.xml b/Web/Presenters/templates/@banned.xml index f7583e82..c3c894d3 100644 --- a/Web/Presenters/templates/@banned.xml +++ b/Web/Presenters/templates/@banned.xml @@ -1,13 +1,13 @@ {extends "@layout.xml"} -{block title}{_"banned_title"}{/block} +{block title}{_banned_title}{/block} {block header} - {_"banned_header"} + {_banned_header} {/block} {block content}
- {_'banned_alt'} + {_banned_alt}

{tr("banned_1", htmlentities($thisUser->getCanonicalName()))|noescape}
diff --git a/Web/Presenters/templates/About/Index.xml b/Web/Presenters/templates/About/Index.xml index 9df911e7..8c6c0ae3 100644 --- a/Web/Presenters/templates/About/Index.xml +++ b/Web/Presenters/templates/About/Index.xml @@ -1,15 +1,15 @@ {extends "../@layout.xml"} -{block title}{_"welcome"}{/block} +{block title}{_welcome}{/block} {block header} - {_"welcome"} + {_welcome} {/block} {block content} {presenter "openvk!Support->knowledgeBaseArticle", "about"}

- {_"log_in"} - {_"registration"} + {_log_in} + {_registration}
{* TO-DO: Add statistics about this instance as on mastodon.social *} {/block} diff --git a/Web/Presenters/templates/About/Invite.xml b/Web/Presenters/templates/About/Invite.xml index 62a1e967..f50ed568 100644 --- a/Web/Presenters/templates/About/Invite.xml +++ b/Web/Presenters/templates/About/Invite.xml @@ -6,9 +6,9 @@ {/block} {block content} - {_"you_can_invite"}

+ {_you_can_invite}

getRefLinkId())}" size="50" />
-

{_"you_can_invite_2"}

+

{_you_can_invite_2}

{/block} diff --git a/Web/Presenters/templates/About/Language.xml b/Web/Presenters/templates/About/Language.xml index db6c06b3..05aa90c7 100644 --- a/Web/Presenters/templates/About/Language.xml +++ b/Web/Presenters/templates/About/Language.xml @@ -1,8 +1,8 @@ {extends "../@layout.xml"} -{block title}{_"select_language"}{/block} +{block title}{_select_language}{/block} {block header} - {_"select_language"} + {_select_language} {/block} {block content} diff --git a/Web/Presenters/templates/Auth/FinishRestoringPassword.xml b/Web/Presenters/templates/Auth/FinishRestoringPassword.xml index b586a1ac..7752c3d0 100644 --- a/Web/Presenters/templates/Auth/FinishRestoringPassword.xml +++ b/Web/Presenters/templates/Auth/FinishRestoringPassword.xml @@ -1,20 +1,20 @@ {extends "../@layout.xml"} {block title} - {_"access_recovery"} + {_access_recovery} {/block} {block header} - {_"page_access_recovery"} + {_page_access_recovery} {/block} {block content}

- {_"access_recovery_info_2"} + {_access_recovery_info_2}

- +

{if $is2faEnabled} @@ -24,6 +24,6 @@ {/if} - +
{/block} diff --git a/Web/Presenters/templates/Auth/Login.xml b/Web/Presenters/templates/Auth/Login.xml index 4a280822..0b534ca1 100644 --- a/Web/Presenters/templates/Auth/Login.xml +++ b/Web/Presenters/templates/Auth/Login.xml @@ -1,8 +1,8 @@ {extends "../@layout.xml"} -{block title}{_"log_in"}{/block} +{block title}{_log_in}{/block} {block header} - {_"log_in"} + {_log_in} {/block} {block content} @@ -11,7 +11,7 @@ - {_"email"}: + {_email}: @@ -19,7 +19,7 @@ - {_"password"}: + {_password}: @@ -31,8 +31,8 @@ - - {_"registration"} + + {_registration} diff --git a/Web/Presenters/templates/Auth/LoginSecondFactor.xml b/Web/Presenters/templates/Auth/LoginSecondFactor.xml index 05c5d986..33b68fac 100644 --- a/Web/Presenters/templates/Auth/LoginSecondFactor.xml +++ b/Web/Presenters/templates/Auth/LoginSecondFactor.xml @@ -1,13 +1,13 @@ {extends "../@layout.xml"} -{block title}{_"log_in"}{/block} +{block title}{_log_in}{/block} {block header} - {_"log_in"} + {_log_in} {/block} {block content}

- {_"two_factor_authentication_login"} + {_two_factor_authentication_login}

@@ -29,7 +29,7 @@ - + diff --git a/Web/Presenters/templates/Auth/Register.xml b/Web/Presenters/templates/Auth/Register.xml index ca47e712..23f40aa1 100644 --- a/Web/Presenters/templates/Auth/Register.xml +++ b/Web/Presenters/templates/Auth/Register.xml @@ -1,8 +1,8 @@ {extends "../@layout.xml"} -{block title}{_"registration"}{/block} +{block title}{_registration}{/block} {block header} - {_"registration"} + {_registration} {/block} {block headIncludes} @@ -28,7 +28,7 @@ - {_"name"}: + {_name}: @@ -36,7 +36,7 @@ - {_"surname"}: + {_surname}: @@ -44,19 +44,19 @@ - {_"gender"}: + {_gender}: {var $femalePreferred = OPENVK_ROOT_CONF["openvk"]["preferences"]["femaleGenderPriority"]} - {_"birth_date"}: + {_birth_date}: @@ -65,7 +65,7 @@ - {_"email"}: + {_email}: @@ -73,7 +73,7 @@ - {_"password"}: + {_password}: @@ -93,8 +93,8 @@ - - {_"log_in"} + + {_log_in} @@ -102,9 +102,9 @@
{else}
- {_'registration_closed'} + {_registration_closed}

- {_"registration_disabled_info"} + {_registration_disabled_info} {if OPENVK_ROOT_CONF['openvk']['preferences']['registration']['reason']}

{php echo OPENVK_ROOT_CONF['openvk']['preferences']['registration']['reason']} {/if} diff --git a/Web/Presenters/templates/Auth/Restore.xml b/Web/Presenters/templates/Auth/Restore.xml index 211ddcef..81d9cf41 100644 --- a/Web/Presenters/templates/Auth/Restore.xml +++ b/Web/Presenters/templates/Auth/Restore.xml @@ -1,24 +1,24 @@ {extends "../@layout.xml"} {block title} - {_"access_recovery"} + {_access_recovery} {/block} {block header} - {_"page_access_recovery"} + {_page_access_recovery} {/block} {block content}

- {_"access_recovery_info"} + {_access_recovery_info}

- +

- +
{/block} diff --git a/Web/Presenters/templates/Group/Admin.xml b/Web/Presenters/templates/Group/Admin.xml index 18fe4574..a056473e 100644 --- a/Web/Presenters/templates/Group/Admin.xml +++ b/Web/Presenters/templates/Group/Admin.xml @@ -12,13 +12,13 @@ - {_"comment"}: + {_comment}: - + @@ -34,7 +34,7 @@ - + diff --git a/Web/Presenters/templates/Group/Create.xml b/Web/Presenters/templates/Group/Create.xml index af5ae7cb..6b8a2cfb 100644 --- a/Web/Presenters/templates/Group/Create.xml +++ b/Web/Presenters/templates/Group/Create.xml @@ -1,19 +1,19 @@ {extends "../@layout.xml"} -{block title}{_"create_group"}{/block} +{block title}{_create_group}{/block} {block header} - {_"create_group"} + {_create_group} {/block} {block content}
-

{_"create_group"}

+

{_create_group}

diff --git a/Web/Presenters/templates/Group/Edit.xml b/Web/Presenters/templates/Group/Edit.xml index a4480747..6eb763ee 100644 --- a/Web/Presenters/templates/Group/Edit.xml +++ b/Web/Presenters/templates/Group/Edit.xml @@ -31,7 +31,7 @@ diff --git a/Web/Presenters/templates/Group/Followers.xml b/Web/Presenters/templates/Group/Followers.xml index 90db51c4..ee2cd5ab 100644 --- a/Web/Presenters/templates/Group/Followers.xml +++ b/Web/Presenters/templates/Group/Followers.xml @@ -54,11 +54,11 @@
- {_"name"}: + {_name}: @@ -21,7 +21,7 @@
- {_"description"}: + {_description}: @@ -33,7 +33,7 @@ - +
- {_"name"}: + {_name}: @@ -39,7 +39,7 @@
- {_"description"}: + {_description}: @@ -105,7 +105,7 @@ - +
- + - + diff --git a/Web/Presenters/templates/Group/View.xml b/Web/Presenters/templates/Group/View.xml index b68fcd2b..dc223af1 100644 --- a/Web/Presenters/templates/Group/View.xml +++ b/Web/Presenters/templates/Group/View.xml @@ -17,22 +17,22 @@
{strpos($alert, "@") === 0 ? tr(substr($alert, 1)) : $alert}
- {_"information"} + {_information}
{_"gender"}: {_gender}: {$user->isFemale() ? "женский" : "мужской"}
{_"registration_date"}: {_registration_date}: {$user->getRegistrationTime()}
- + - + - +
{_"name_group"}:{_name_group}: {$club->getName()}
{_"description"}:{_description}: {$club->getDescriptionHtml()|noescape}
{_"website"}: {_website}: {$club->getWebsite()} @@ -78,7 +78,7 @@
{tr("topics", $topicsCount)}
@@ -100,38 +100,38 @@
- {_"group_type"} + {_group_type}
- {_"group_type_open"} + {_group_type_open}
- {_"creator"} + {_creator}
{var $author = $club->getOwner()} @@ -154,13 +154,13 @@ {var $managersCount = $club->getManagersCount(true)}
- {_"administrators"} + {_administrators}
{tr("administrators", $managersCount)}
@@ -193,13 +193,13 @@
- {_"albums"} + {_albums}
{tr("albums", $albumsCount)}
@@ -227,7 +227,7 @@
{tr("topics", $topicsCount)}
diff --git a/Web/Presenters/templates/Photos/Album.xml b/Web/Presenters/templates/Photos/Album.xml index 47b1f983..6f22c490 100644 --- a/Web/Presenters/templates/Photos/Album.xml +++ b/Web/Presenters/templates/Photos/Album.xml @@ -9,9 +9,9 @@ {$album->getOwner()->getCanonicalName()} {if $isClub} - » {_"albums"} + » {_albums} {else} - » {_"albums"} + » {_albums} {/if} » {$album->getName()} {/block} @@ -23,9 +23,9 @@ {if !is_null($thisUser) && $album->canBeModifiedBy($thisUser) && !$album->isCreatedBySystem()}  |  - {_"upload_photo"} + {_upload_photo}  |  - {_"edit_album"} + {_edit_album} {/if}

{if $album->getPhotosCount() > 0} diff --git a/Web/Presenters/templates/Photos/AlbumList.xml b/Web/Presenters/templates/Photos/AlbumList.xml index 2af374c2..f6742463 100644 --- a/Web/Presenters/templates/Photos/AlbumList.xml +++ b/Web/Presenters/templates/Photos/AlbumList.xml @@ -2,7 +2,7 @@ {var $iterator = iterator_to_array($albums)} {var $page = $paginatorConf->page} -{block title}{_"albums"} {$owner->getCanonicalName()}{/block} +{block title}{_albums} {$owner->getCanonicalName()}{/block} {block header} {if isset($thisUser) && $thisUser->getId() == $owner->getId()} diff --git a/Web/Presenters/templates/Photos/CreateAlbum.xml b/Web/Presenters/templates/Photos/CreateAlbum.xml index 475cabaa..d8192ced 100644 --- a/Web/Presenters/templates/Photos/CreateAlbum.xml +++ b/Web/Presenters/templates/Photos/CreateAlbum.xml @@ -1,39 +1,39 @@ {extends "../@layout.xml"} -{block title}{_"creating_album"}{/block} +{block title}{_creating_album}{/block} {block header} {ifset $club} {$club->getName()} » - {_"albums"} + {_albums} {else} {$thisUser->getCanonicalName()} » - {_"albums"} + {_albums} {/ifset} » - {_"creating_album"} + {_creating_album} {/block} {block content}
-

{_"creating_album"}

+

{_creating_album}

- + - + diff --git a/Web/Presenters/templates/Photos/EditAlbum.xml b/Web/Presenters/templates/Photos/EditAlbum.xml index b9a99869..271d1034 100644 --- a/Web/Presenters/templates/Photos/EditAlbum.xml +++ b/Web/Presenters/templates/Photos/EditAlbum.xml @@ -5,9 +5,9 @@ {$album->getOwner()->getCanonicalName()} » {if $album->getOwner() instanceof openvk\Web\Models\Entities\Club} - {_"albums"} + {_albums} {else} - {_"albums"} + {_albums} {/if} » {$album->getName()} @@ -18,11 +18,11 @@
{_"name"}:{_name}:
{_"description"}:{_description}:
- +
- + - + @@ -31,7 +31,7 @@ @@ -39,6 +39,6 @@
- {_"you_can_also"} {_"delete_album"}. + {_you_can_also} {_delete_album}.
{/block} diff --git a/Web/Presenters/templates/Photos/EditPhoto.xml b/Web/Presenters/templates/Photos/EditPhoto.xml index 3b55fbec..9c269491 100644 --- a/Web/Presenters/templates/Photos/EditPhoto.xml +++ b/Web/Presenters/templates/Photos/EditPhoto.xml @@ -4,7 +4,7 @@ {block header} {$thisUser->getCanonicalName()} » - {_"photo"} + {_photo} {/block} {block content} @@ -12,7 +12,7 @@
{_"name"}:{_name}:
{_"description"}:{_description}: - +
- + @@ -21,7 +21,7 @@ diff --git a/Web/Presenters/templates/Photos/Photo.xml b/Web/Presenters/templates/Photos/Photo.xml index a28f0f90..ad9f9efd 100644 --- a/Web/Presenters/templates/Photos/Photo.xml +++ b/Web/Presenters/templates/Photos/Photo.xml @@ -1,6 +1,6 @@ {extends "../@layout.xml"} -{block title}{_"photo"}{/block} +{block title}{_photo}{/block} {block header} {ifset $album} @@ -8,15 +8,15 @@ {$album->getOwner()->getCanonicalName()} {if ($album->getOwner() instanceof openvk\Web\Models\Entities\Club)} - » {_"albums"} + » {_albums} {else} - » {_"albums"} + » {_albums} {/if} » {$album->getName()} {else} {$photo->getOwner()->getCanonicalName()} {/ifset} - » {_"photo"} + » {_photo} {/block} {block content} @@ -32,21 +32,21 @@
-

{_"information"}

- {_"info_description"}: - {$photo->getDescription() ?? "(отсутствует)"}
- {_"info_uploaded_by"}: +

{_information}

+ {_info_description}: + {$photo->getDescription() ?? "(" . tr("none") . ")"}
+ {_info_uploaded_by}: {$photo->getOwner()->getFullName()}
- {_"info_upload_date"}: + {_info_upload_date}: {$photo->getPublicationTime()}

{_actions}

- {_"open_original"} + {_open_original}
{/block} diff --git a/Web/Presenters/templates/Photos/UploadPhoto.xml b/Web/Presenters/templates/Photos/UploadPhoto.xml index 9f4d16f8..55a80966 100644 --- a/Web/Presenters/templates/Photos/UploadPhoto.xml +++ b/Web/Presenters/templates/Photos/UploadPhoto.xml @@ -1,14 +1,14 @@ {extends "../@layout.xml"} -{block title}{_"upload_photo"}{/block} +{block title}{_upload_photo}{/block} {block header} {$thisUser->getCanonicalName()} » - {_"albums"} + {_albums} » {$album->getName()} » - {_"upload_photo"} + {_upload_photo} {/block} {block content} @@ -16,11 +16,11 @@
{_"description"}:{_description}: - +
- + - + diff --git a/Web/Presenters/templates/Search/Index.xml b/Web/Presenters/templates/Search/Index.xml index df0ff0c0..ab184873 100644 --- a/Web/Presenters/templates/Search/Index.xml +++ b/Web/Presenters/templates/Search/Index.xml @@ -51,7 +51,7 @@ {/block} {block preview} - {_ + {_photo} {/block} {block name} @@ -63,21 +63,21 @@ {if $type === "users"} - + - + - + {/if} @@ -649,7 +649,7 @@ diff --git a/Web/Presenters/templates/User/TwoFactorAuthCodes.xml b/Web/Presenters/templates/User/TwoFactorAuthCodes.xml index 9adbc639..c1c2c6a1 100644 --- a/Web/Presenters/templates/User/TwoFactorAuthCodes.xml +++ b/Web/Presenters/templates/User/TwoFactorAuthCodes.xml @@ -1,18 +1,18 @@ {extends "../@layout.xml"} -{block title}{_"my_settings"} - {_"two_factor_authentication"}{/block} +{block title}{_my_settings} - {_two_factor_authentication}{/block} {block header} - {_"my_settings"} » {_"two_factor_authentication"} + {_my_settings} » {_two_factor_authentication} {/block} {block content} -

{_"backup_codes"}

-

{_"two_factor_authentication_backup_codes_1"}

-

{_"two_factor_authentication_backup_codes_2"|noescape}

+

{_backup_codes}

+

{_two_factor_authentication_backup_codes_1}

+

{_two_factor_authentication_backup_codes_2|noescape}

  1. {$code}
-

{_"two_factor_authentication_backup_codes_3"}

+

{_two_factor_authentication_backup_codes_3}

{/block} diff --git a/Web/Presenters/templates/User/TwoFactorAuthSettings.xml b/Web/Presenters/templates/User/TwoFactorAuthSettings.xml index 9bb3e046..7ab9827d 100644 --- a/Web/Presenters/templates/User/TwoFactorAuthSettings.xml +++ b/Web/Presenters/templates/User/TwoFactorAuthSettings.xml @@ -1,18 +1,18 @@ {extends "../@layout.xml"} -{block title}{_"my_settings"} - {_"two_factor_authentication"}{/block} +{block title}{_my_settings} - {_two_factor_authentication}{/block} {block header} - {_"my_settings"} » {_"two_factor_authentication"} + {_my_settings} » {_two_factor_authentication} {/block} {block content} - {_"two_factor_authentication_settings_1"|noescape} -

{_"two_factor_authentication_settings_2"}

+ {_two_factor_authentication_settings_1|noescape} +

{_two_factor_authentication_settings_2}

{tr("two_factor_authentication_settings_3", $secret)|noescape}

-

{_"two_factor_authentication_settings_4"}

+

{_two_factor_authentication_settings_4}

{_"description"}:{_description}:
{_"photo"}:{_photo}:
{_"gender"}: {_gender}: {$x->isFemale() ? tr("female") : tr("male")}
{_"relationship"}:{_relationship}: {$x->getLocalizedMaritalStatus()}
{_"registration_date"}: {_registration_date}: {$x->getRegistrationTime()}
- {_"description"}: + {_description}: {$x->getDescription() ?? '(' . tr("none") . ')'} diff --git a/Web/Presenters/templates/Support/Index.xml b/Web/Presenters/templates/Support/Index.xml index 8d41fee9..25c43100 100644 --- a/Web/Presenters/templates/Support/Index.xml +++ b/Web/Presenters/templates/Support/Index.xml @@ -28,7 +28,7 @@ {if $isNew} {if !is_null($banReason)}
- {_'banned_alt'} + {_banned_alt}

{tr("banned_in_support_1", htmlentities($thisUser->getCanonicalName()))|noescape}
diff --git a/Web/Presenters/templates/Topics/Board.xml b/Web/Presenters/templates/Topics/Board.xml index eb6c4396..a494228b 100644 --- a/Web/Presenters/templates/Topics/Board.xml +++ b/Web/Presenters/templates/Topics/Board.xml @@ -14,8 +14,8 @@ {block tabs}

- - + +

diff --git a/Web/Presenters/templates/User/Edit.xml b/Web/Presenters/templates/User/Edit.xml index 89057064..96152132 100644 --- a/Web/Presenters/templates/User/Edit.xml +++ b/Web/Presenters/templates/User/Edit.xml @@ -1,8 +1,8 @@ {extends "../@layout.xml"} -{block title}{_"edit_page"}{/block} +{block title}{_edit_page}{/block} {block header} - {_"edit_page"} + {_edit_page} {/block} {block content} @@ -18,29 +18,29 @@

- {_"main"} + {_main}
- {_"contacts"} + {_contacts}
- {_"interests"} + {_interests}
- {_"avatar"} + {_avatar}
{if $isMain} -

{_"main_information"}

+

{_main_information}

@@ -167,13 +167,13 @@ {elseif $isContacts} -

{_"contact_information"}

+

{_contact_information}

- {_"name"}: + {_name}: @@ -48,7 +48,7 @@
- {_"surname"}: + {_surname}: @@ -56,7 +56,7 @@
- {_"nickname"}: + {_nickname}: @@ -65,7 +65,7 @@ {if OPENVK_ROOT_CONF['openvk']['credentials']['zadarma']['enable']}
- {_"phone"}: + {_phone}: @@ -74,7 +74,7 @@ {/if}
- {_"status"}: + {_status}: @@ -82,7 +82,7 @@
- {_"hometown"}: + {_hometown}: @@ -90,7 +90,7 @@
- {_"relationship"}: + {_relationship}:
- {_"politViews"}: + {_politViews}:
- {_"gender"}: + {_gender}:
- {_"birth_date"}: + {_birth_date}: getBirthday()) ? NULL : $user->getBirthday()->format('%Y-%m-%d')} type="date" style="margin-bottom: 7px;" /> @@ -158,7 +158,7 @@ - +
@@ -226,13 +226,13 @@ {elseif $isInterests} -

{_"personal_information"}

+

{_personal_information}

- {_"email"}: + {_email}: @@ -181,7 +181,7 @@
- {_"telegram"}: + {_telegram}: @@ -189,7 +189,7 @@
- {_"personal_website"}: + {_personal_website}: @@ -197,7 +197,7 @@
- {_"city"}: + {_city}: @@ -205,7 +205,7 @@
- {_"address"}: + {_address}: @@ -217,7 +217,7 @@ - +
@@ -301,13 +301,13 @@ {elseif $isAvatar} -

{_"profile_picture"}

+

{_profile_picture}

- {_"interests"}: + {_interests}: @@ -240,7 +240,7 @@
- {_"favorite_music"}: + {_favorite_music}: @@ -248,7 +248,7 @@
- {_"favorite_films"}: + {_favorite_films}: @@ -256,7 +256,7 @@
- {_"favorite_shows"}: + {_favorite_shows}: @@ -264,7 +264,7 @@
- {_"favorite_books"}: + {_favorite_books}: @@ -272,7 +272,7 @@
- {_"favorite_quotes"}: + {_favorite_quotes}: @@ -280,7 +280,7 @@
- {_"information_about"}: + {_information_about}: @@ -292,7 +292,7 @@ - +
diff --git a/Web/Presenters/templates/User/Friends.xml b/Web/Presenters/templates/User/Friends.xml index 0c06dd8f..79982fc9 100644 --- a/Web/Presenters/templates/User/Friends.xml +++ b/Web/Presenters/templates/User/Friends.xml @@ -19,13 +19,13 @@ {block title} {if $act == "incoming"} - {_"incoming_req"} + {_incoming_req} {elseif $act == "outcoming"} - {_"outcoming_req"} + {_outcoming_req} {elseif $act == "online"} - {_"friends_online"} + {_friends_online} {else} - {_"friends"} + {_friends} {/if} {/block} @@ -35,13 +35,13 @@ {else} {$user->getCanonicalName()} » {if $act == "incoming"} - {_"incoming_req"} + {_incoming_req} {elseif $act == "outcoming"} - {_"outcoming_req"} + {_outcoming_req} {elseif $act == "online"} - {_"friends_online"} + {_friends_online} {else} - {_"friends"} + {_friends} {/if} {/if} {/block} @@ -108,15 +108,15 @@
- {_"picture"}: + {_picture}: @@ -319,7 +319,7 @@ - +
- + - + - + @@ -131,29 +131,29 @@ - + {elseif $subStatus === 1} - + {elseif $subStatus === 2} - + {elseif $subStatus === 3} - {_"send_message"} + {_send_message} - + {/if} {/if} diff --git a/Web/Presenters/templates/User/Groups.xml b/Web/Presenters/templates/User/Groups.xml index 8d3273e3..f05a9bb9 100644 --- a/Web/Presenters/templates/User/Groups.xml +++ b/Web/Presenters/templates/User/Groups.xml @@ -87,7 +87,7 @@ - + {/if} {/block} diff --git a/Web/Presenters/templates/User/Settings.xml b/Web/Presenters/templates/User/Settings.xml index a029580f..f5125d8c 100644 --- a/Web/Presenters/templates/User/Settings.xml +++ b/Web/Presenters/templates/User/Settings.xml @@ -1,8 +1,8 @@ {extends "../@layout.xml"} -{block title}{_"my_settings"}{/block} +{block title}{_my_settings}{/block} {block header} - {_"my_settings"} + {_my_settings} {/block} {block content} @@ -15,16 +15,16 @@
- {_"main"} + {_main}
- {_"privacy"} + {_privacy}
{_points}
- {_"interface"} + {_interface}
@@ -32,12 +32,12 @@ {if $isMain} -

{_"change_password"}

+

{_change_password}

{_"gender"}: {_gender}: {$x->isFemale() ? tr("female") : tr("male")}
{_"relationship"}:{_relationship}: {$x->getLocalizedMaritalStatus()}
{_"registration_date"}: {_registration_date}: {$x->getRegistrationTime()}
@@ -214,7 +214,7 @@ @@ -362,7 +362,7 @@
- {_"old_password"} + {_old_password} @@ -45,7 +45,7 @@
- {_"new_password"} + {_new_password} @@ -53,7 +53,7 @@
- {_"repeat_password"} + {_repeat_password} @@ -73,7 +73,7 @@ - +
- +
- +
@@ -464,23 +464,23 @@
- {_"avatars_style"} + {_avatars_style}
- {_"style"} + {_style} - +
- +
diff --git a/Web/Presenters/templates/User/View.xml b/Web/Presenters/templates/User/View.xml index 18a7d67b..a2b8cb0d 100644 --- a/Web/Presenters/templates/User/View.xml +++ b/Web/Presenters/templates/User/View.xml @@ -34,7 +34,7 @@ class="name-checkmark" src="/assets/packages/static/openvk/img/checkmark.png" /> - ({_"this_is_you"}) + ({_this_is_you})
@@ -70,7 +70,7 @@
- + - + - + - + - + - + @@ -412,14 +412,14 @@
- {_"information"} + {_information}
{capture $contactInfo_Tmp}
{_"gender"}: {_gender}: {$user->isFemale() ? tr("female") : tr("male")}
{_"relationship"}:{_relationship}: {$user->getLocalizedMaritalStatus()}
{_"registration_date"}: {_registration_date}: {$user->getRegistrationTime()}
{_"hometown"}:{_hometown}: {$user->getHometown()}
{_"politViews"}:{_politViews}: {var $pviews = $user->getPoliticalViews()}{_"politViews_$pviews"}
{_"birth_date"}:{_birth_date}: {$user->getBirthday()->format('%e %B %Y')}, {tr("years", $user->getAge())} {$user->getBirthday()->format('%e %B')}
- + - + - + - + - + @@ -457,27 +457,27 @@
{_"email"}: {_email}: {$user->getContactEmail()} @@ -427,7 +427,7 @@
{_"telegram"}: {_telegram}: @{$user->getTelegram()} @@ -435,7 +435,7 @@
{_"personal_website"}: {_personal_website}: {$user->getWebsite()} @@ -443,11 +443,11 @@
{_"city"}:{_city}: {$user->getCity()}
{_"address"}:{_address}: {$user->getPhysicalAddress()}
- + - + - + - + - + - + @@ -489,14 +489,14 @@ {/capture}
-

{_"contact_information"} {ifset $thisUser}{if $thisUser->getId() == $user->getId()}[ {_"edit"} ]{/if}{/ifset}

+

{_contact_information} {ifset $thisUser}{if $thisUser->getId() == $user->getId()}[ {_edit} ]{/if}{/ifset}

{if !empty($contactInfo_Tmp)} {$contactInfo_Tmp|noescape} {else}
{_no_information_provided}
{/if}
-

{_"personal_information"} {ifset $thisUser}{if $thisUser->getId() == $user->getId()}[ {_"edit"} ]{/if}{/ifset}

+

{_personal_information} {ifset $thisUser}{if $thisUser->getId() == $user->getId()}[ {_edit} ]{/if}{/ifset}

{if !empty($uInfo_Tmp)} {$uInfo_Tmp|noescape} {else} diff --git a/Web/Presenters/templates/User/banned.xml b/Web/Presenters/templates/User/banned.xml index ec08e473..d1d5eef7 100644 --- a/Web/Presenters/templates/User/banned.xml +++ b/Web/Presenters/templates/User/banned.xml @@ -2,7 +2,7 @@ Пользователь заблокирован.

{tr("user_banned", htmlentities($user->getFirstName()))|noescape}
- {_"user_banned_comment"} {$user->getBanReason()}. + {_user_banned_comment} {$user->getBanReason()}.

{if isset($thisUser)}

diff --git a/Web/Presenters/templates/Videos/Edit.xml b/Web/Presenters/templates/Videos/Edit.xml index 1daf838d..4a97b319 100644 --- a/Web/Presenters/templates/Videos/Edit.xml +++ b/Web/Presenters/templates/Videos/Edit.xml @@ -4,9 +4,9 @@ {block header} {$thisUser->getCanonicalName()} » - {_"videos"} + {_videos} » - {_"video"} + {_video} » Изменить видеозапись {/block} @@ -18,13 +18,13 @@

{_"interests"}: {_interests}: {$user->getInterests()}
{_"favorite_music"}: {_favorite_music}: {$user->getFavoriteMusic()}
{_"favorite_films"}: {_favorite_films}: {$user->getFavoriteFilms()}
{_"favorite_shows"}: {_favorite_shows}: {$user->getFavoriteShows()}
{_"favorite_books"}: {_favorite_books}: {$user->getFavoriteBooks()}
{_"favorite_quotes"}: {_favorite_quotes}: {$user->getFavoriteQuote()}
- + - + @@ -33,7 +33,7 @@ diff --git a/Web/Presenters/templates/Videos/List.xml b/Web/Presenters/templates/Videos/List.xml index 32ad2e87..f22553f4 100644 --- a/Web/Presenters/templates/Videos/List.xml +++ b/Web/Presenters/templates/Videos/List.xml @@ -3,11 +3,11 @@ {var $count = $paginatorConf->count} {var $page = $paginatorConf->page} -{block title}{_"videos"} {$user->getCanonicalName()}{/block} +{block title}{_videos} {$user->getCanonicalName()}{/block} {block header} {$user->getCanonicalName()} - » {_"videos"} + » {_videos} {/block} {block size} @@ -48,10 +48,10 @@

{$x->getDescription() ?? ""}

- {_"video_uploaded"} {$x->getPublicationTime()}
- {_"video_updated"} {$x->getEditTime() ?? $x->getPublicationTime()} + {_video_uploaded} {$x->getPublicationTime()}
+ {_video_updated} {$x->getEditTime() ?? $x->getPublicationTime()}

{_view_video} - {if $x->getCommentsCount() > 0}| {_"comments"} ({$x->getCommentsCount()}){/if} + {if $x->getCommentsCount() > 0}| {_comments} ({$x->getCommentsCount()}){/if}

{/block} diff --git a/Web/Presenters/templates/Videos/Upload.xml b/Web/Presenters/templates/Videos/Upload.xml index d5f3a525..1e00a345 100644 --- a/Web/Presenters/templates/Videos/Upload.xml +++ b/Web/Presenters/templates/Videos/Upload.xml @@ -1,41 +1,41 @@ {extends "../@layout.xml"} -{block title}{_"upload_video"}{/block} +{block title}{_upload_video}{/block} {block header} {$thisUser->getCanonicalName()} » - {_"videos"} + {_videos} » - {_"upload_video"} + {_upload_video} {/block} {block content}
-

{_"upload_video"}

+

{_upload_video}

{_"name"}:{_name}:
{_"description"}:{_description}: - +
- + - + - + - + diff --git a/Web/Presenters/templates/Videos/View.xml b/Web/Presenters/templates/Videos/View.xml index ee6ef578..9ad34fda 100644 --- a/Web/Presenters/templates/Videos/View.xml +++ b/Web/Presenters/templates/Videos/View.xml @@ -5,9 +5,9 @@ {block header} {$user->getCanonicalName()} » - {_"videos"} + {_videos} » - {_"video"} + {_video} {/block} {block content} @@ -37,14 +37,14 @@
-

{_"information"}

- {_"info_name"}: +

{_information}

+ {_info_name}: {$video->getName()}
- {_"info_description"}: - {$video->getDescription() ?? "(отсутствует)"}
- {_"info_uploaded_by"}: + {_info_description}: + {$video->getDescription() ?? "(" . tr("none") . ")"}
+ {_info_uploaded_by}: {$user->getFullName()}
- {_"info_upload_date"}: + {_info_upload_date}: {$video->getPublicationTime()}

diff --git a/Web/Presenters/templates/Wall/Feed.xml b/Web/Presenters/templates/Wall/Feed.xml index 82aeeb2c..f5c6ae50 100644 --- a/Web/Presenters/templates/Wall/Feed.xml +++ b/Web/Presenters/templates/Wall/Feed.xml @@ -1,8 +1,8 @@ {extends "../@layout.xml"} -{block title}{_"feed"}{/block} +{block title}{_feed}{/block} {block header} - {_"feed"} + {_feed} {/block} {block content} @@ -29,7 +29,7 @@ {include "../components/paginator.xml", conf => $paginatorConf}
- {_"posts_per_page"}: + {_posts_per_page}:
{_"name"}:{_name}:
{_"description"}:{_description}:
{_"video"}:{_video}:
{_"video_link_to_yt"}:{_video_link_to_yt}:
- +