Skip to content

Commit

Permalink
Locales: Make more strings translatable (#961)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrilyew
mrilyew authored Sep 17, 2023
1 parent 0ef413a commit 468eba8
Show file tree
Hide file tree
Showing 48 changed files with 688 additions and 239 deletions.
6 changes: 3 additions & 3 deletions Web/Models/Entities/Club.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ function getPostViewStats(bool $unique = false): ?array
"shape" => "spline",
"color" => "#597da3",
],
"name" => $unique ? "Полный охват" : "Все просмотры",
"name" => $unique ? tr("full_coverage") : tr("all_views"),
],
"subs" => [
"x" => array_reverse(range(1, 7)),
Expand All @@ -235,7 +235,7 @@ function getPostViewStats(bool $unique = false): ?array
"color" => "#b05c91",
],
"fill" => "tozeroy",
"name" => $unique ? "Охват подписчиков" : "Просмотры подписчиков",
"name" => $unique ? tr("subs_coverage") : tr("subs_views"),
],
"viral" => [
"x" => array_reverse(range(1, 7)),
Expand All @@ -246,7 +246,7 @@ function getPostViewStats(bool $unique = false): ?array
"color" => "#4d9fab",
],
"fill" => "tozeroy",
"name" => $unique ? "Виральный охват" : "Виральные просмотры",
"name" => $unique ? tr("viral_coverage") : tr("viral_views"),
],
];
}
Expand Down
8 changes: 4 additions & 4 deletions Web/Presenters/AdminPresenter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ function renderGift(int $id): void
$this->notFound();

$gift->delete();
$this->flashFail("succ", "Gift moved successfully", "This gift will now be in <b>Recycle Bin</b>.");
$this->flashFail("succ", tr("admin_gift_moved_successfully"), tr("admin_gift_moved_to_recycle"));
break;
case "copy":
case "move":
Expand All @@ -302,7 +302,7 @@ function renderGift(int $id): void
$catTo->addGift($gift);

$name = $catTo->getName();
$this->flash("succ", "Gift moved successfully", "This gift will now be in <b>$name</b>.");
$this->flash("succ", tr("admin_gift_moved_successfully"), "This gift will now be in <b>$name</b>.");
$this->redirect("/admin/gifts/" . $catTo->getSlug() . "." . $catTo->getId() . "/");
break;
default:
Expand Down Expand Up @@ -333,10 +333,10 @@ function renderGift(int $id): void
$gift->setUsages((int) $this->postParam("usages"));
if(isset($_FILES["pic"]) && $_FILES["pic"]["error"] === UPLOAD_ERR_OK) {
if(!$gift->setImage($_FILES["pic"]["tmp_name"]))
$this->flashFail("err", "Не удалось сохранить подарок", "Изображение подарка кривое.");
$this->flashFail("err", tr("error_when_saving_gift"), tr("error_when_saving_gift_bad_image"));
} else if($gen) {
# If there's no gift pic but it's newly created
$this->flashFail("err", "Не удалось сохранить подарок", "Пожалуйста, загрузите изображение подарка.");
$this->flashFail("err", tr("error_when_saving_gift"), tr("error_when_saving_gift_no_image"));
}

$gift->save();
Expand Down
18 changes: 9 additions & 9 deletions Web/Presenters/CommentPresenter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function renderMakeComment(string $repo, int $eId): void
$this->flashFail("err", tr("error"), tr("forbidden"));

if($_FILES["_vid_attachment"] && OPENVK_ROOT_CONF['openvk']['preferences']['videos']['disableUploading'])
$this->flashFail("err", tr("error"), "Video uploads are disabled by the system administrator.");
$this->flashFail("err", tr("error"), tr("video_uploads_disabled"));

$flags = 0;
if($this->postParam("as_group") === "on" && !is_null($club) && $club->canBeModifiedBy($this->user->identity))
Expand All @@ -66,7 +66,7 @@ function renderMakeComment(string $repo, int $eId): void
try {
$photo = Photo::fastMake($this->user->id, $this->postParam("text"), $_FILES["_pic_attachment"]);
} catch(ISE $ex) {
$this->flashFail("err", "Не удалось опубликовать пост", "Файл изображения повреждён, слишком велик или одна сторона изображения в разы больше другой.");
$this->flashFail("err", tr("error_when_publishing_comment"), tr("error_when_publishing_comment_description"));
}
}

Expand All @@ -86,11 +86,11 @@ function renderMakeComment(string $repo, int $eId): void
$video = Video::fastMake($this->user->id, $_FILES["_vid_attachment"]["name"], $this->postParam("text"), $_FILES["_vid_attachment"]);
}
} catch(ISE $ex) {
$this->flashFail("err", "Не удалось опубликовать комментарий", "Файл медиаконтента повреждён или слишком велик.");
$this->flashFail("err", tr("error_when_publishing_comment"), tr("error_comment_file_too_big"));
}

if(empty($this->postParam("text")) && !$photo && !$video)
$this->flashFail("err", "Не удалось опубликовать комментарий", "Комментарий пустой или слишком большой.");
$this->flashFail("err", tr("error_when_publishing_comment"), tr("error_comment_empty"));

try {
$comment = new Comment;
Expand All @@ -102,7 +102,7 @@ function renderMakeComment(string $repo, int $eId): void
$comment->setFlags($flags);
$comment->save();
} catch (\LengthException $ex) {
$this->flashFail("err", "Не удалось опубликовать комментарий", "Комментарий слишком большой.");
$this->flashFail("err", tr("error_when_publishing_comment"), tr("error_comment_too_big"));
}

if(!is_null($photo))
Expand All @@ -124,7 +124,7 @@ function renderMakeComment(string $repo, int $eId): void
if($mentionee instanceof User)
(new MentionNotification($mentionee, $entity, $comment->getOwner(), strip_tags($comment->getText())))->emit();

$this->flashFail("succ", "Комментарий добавлен", "Ваш комментарий появится на странице.");
$this->flashFail("succ", tr("comment_is_added"), tr("comment_is_added_desc"));
}

function renderDeleteComment(int $id): void
Expand All @@ -135,15 +135,15 @@ function renderDeleteComment(int $id): void
$comment = (new Comments)->get($id);
if(!$comment) $this->notFound();
if(!$comment->canBeDeletedBy($this->user->identity))
$this->throwError(403, "Forbidden", "У вас недостаточно прав чтобы редактировать этот ресурс.");
$this->throwError(403, "Forbidden", tr("error_access_denied"));
if ($comment->getTarget() instanceof Post && $comment->getTarget()->getWallOwner()->isBanned())
$this->flashFail("err", tr("error"), tr("forbidden"));

$comment->delete();
$this->flashFail(
"succ",
"Успешно",
"Этот комментарий больше не будет показыватся.<br/><a href='/al_comments/spam?$id'>Отметить как спам</a>?"
tr("success"),
tr("comment_will_not_appear")
);
}
}
10 changes: 5 additions & 5 deletions Web/Presenters/GiftsPresenter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function renderGiftList(): void
$user = $this->users->get((int) ($this->queryParam("user") ?? 0));
$cat = $this->gifts->getCat((int) ($this->queryParam("pack") ?? 0));
if(!$user || !$cat)
$this->flashFail("err", "Не удалось подарить", "Пользователь или набор не существуют.");
$this->flashFail("err", tr("error_when_gifting"), tr("error_user_not_exists"));

$this->template->page = $page = (int) ($this->queryParam("p") ?? 1);
$gifts = $cat->getGifts($page, null, $this->template->count);
Expand All @@ -66,14 +66,14 @@ function renderConfirmGift(): void
$gift = $this->gifts->get((int) ($this->queryParam("elid") ?? 0));
$cat = $this->gifts->getCat((int) ($this->queryParam("pack") ?? 0));
if(!$user || !$cat || !$gift || !$cat->hasGift($gift))
$this->flashFail("err", "Не удалось подарить", "Не удалось подтвердить права на подарок.");
$this->flashFail("err", tr("error_when_gifting"), tr("error_no_rights_gifts"));

if(!$gift->canUse($this->user->identity))
$this->flashFail("err", "Не удалось подарить", "У вас больше не осталось таких подарков.");
$this->flashFail("err", tr("error_when_gifting"), tr("error_no_more_gifts"));

$coinsLeft = $this->user->identity->getCoins() - $gift->getPrice();
if($coinsLeft < 0)
$this->flashFail("err", "Не удалось подарить", "Ору нищ не пук.");
$this->flashFail("err", tr("error_when_gifting"), tr("error_no_money"));

$this->template->_template = "Gifts/Confirm.xml";
if($_SERVER["REQUEST_METHOD"] !== "POST") {
Expand All @@ -91,7 +91,7 @@ function renderConfirmGift(): void
$user->gift($this->user->identity, $gift, $comment, !is_null($this->postParam("anonymous")));
$gift->used();

$this->flash("succ", "Подарок отправлен", "Вы отправили подарок <b>" . $user->getFirstName() . "</b> за " . $gift->getPrice() . " голосов.");
$this->flash("succ", tr("gift_sent"), tr("gift_sent_desc", $user->getFirstName(), $gift->getPrice()));
$this->redirect($user->getURL());
}

Expand Down
30 changes: 15 additions & 15 deletions Web/Presenters/GroupPresenter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ function renderCreate(): void
$club->save();
} catch(\PDOException $ex) {
if($ex->getCode() == 23000)
$this->flashFail("err", "Ошибка", "Произошла ошибка на стороне сервера. Обратитесь к системному администратору.");
$this->flashFail("err", tr("error"), tr("error_on_server_side"));
else
throw $ex;
}

$club->toggleSubscription($this->user->identity);
$this->redirect("/club" . $club->getId());
}else{
$this->flashFail("err", "Ошибка", "Вы не ввели название группы.");
$this->flashFail("err", tr("error"), tr("error_no_group_name"));
}
}
}
Expand Down Expand Up @@ -132,7 +132,7 @@ function renderModifyAdmin(int $id): void
$this->notFound();

if(!$club->canBeModifiedBy($this->user->identity ?? NULL))
$this->flashFail("err", "Ошибка доступа", "У вас недостаточно прав, чтобы изменять этот ресурс.");
$this->flashFail("err", tr("error_access_denied_short"), tr("error_access_denied"));

if(!is_null($hidden)) {
if($club->getOwner()->getId() == $user->getId()) {
Expand All @@ -150,9 +150,9 @@ function renderModifyAdmin(int $id): void
}

if($hidden) {
$this->flashFail("succ", "Операция успешна", "Теперь " . $user->getCanonicalName() . " будет показываться как обычный подписчик всем кроме других администраторов");
$this->flashFail("succ", tr("success_action"), tr("x_is_now_hidden", $user->getCanonicalName()));
} else {
$this->flashFail("succ", "Операция успешна", "Теперь все будут знать про то что " . $user->getCanonicalName() . " - администратор");
$this->flashFail("succ", tr("success_action"), tr("x_is_now_showed", $user->getCanonicalName()));
}
} elseif($removeComment) {
if($club->getOwner()->getId() == $user->getId()) {
Expand All @@ -164,11 +164,11 @@ function renderModifyAdmin(int $id): void
$manager->save();
}

$this->flashFail("succ", "Операция успешна", "Комментарий к администратору удален");
$this->flashFail("succ", tr("success_action"), tr("comment_is_deleted"));
} elseif($comment) {
if(mb_strlen($comment) > 36) {
$commentLength = (string) mb_strlen($comment);
$this->flashFail("err", "Ошибка", "Комментарий слишком длинный ($commentLength символов вместо 36 символов)");
$this->flashFail("err", tr("error"), tr("comment_is_too_long", $commentLength));
}

if($club->getOwner()->getId() == $user->getId()) {
Expand All @@ -180,16 +180,16 @@ function renderModifyAdmin(int $id): void
$manager->save();
}

$this->flashFail("succ", "Операция успешна", "Комментарий к администратору изменён");
$this->flashFail("succ", tr("success_action"), tr("comment_is_changed"));
}else{
if($club->canBeModifiedBy($user)) {
$club->removeManager($user);
$this->flashFail("succ", "Операция успешна", $user->getCanonicalName() . " более не администратор.");
$this->flashFail("succ", tr("success_action"), tr("x_no_more_admin", $user->getCanonicalName()));
} else {
$club->addManager($user);

(new ClubModeratorNotification($user, $club, $this->user->identity))->emit();
$this->flashFail("succ", "Операция успешна", $user->getCanonicalName() . " назначен(а) администратором.");
$this->flashFail("succ", tr("success_action"), tr("x_is_admin", $user->getCanonicalName()));
}
}

Expand Down Expand Up @@ -245,20 +245,20 @@ function renderEdit(int $id): void
(new Albums)->getClubAvatarAlbum($club)->addPhoto($photo);
} catch(ISE $ex) {
$name = $album->getName();
$this->flashFail("err", "Неизвестная ошибка", "Не удалось сохранить фотографию.");
$this->flashFail("err", tr("error"), tr("error_when_uploading_photo"));
}
}

try {
$club->save();
} catch(\PDOException $ex) {
if($ex->getCode() == 23000)
$this->flashFail("err", "Ошибка", "Произошла ошибка на стороне сервера. Обратитесь к системному администратору.");
$this->flashFail("err", tr("error"), tr("error_on_server_side"));
else
throw $ex;
}

$this->flash("succ", "Изменения сохранены", "Новые данные появятся в вашей группе.");
$this->flash("succ", tr("changes_saved"), tr("new_changes_desc"));
}
}

Expand Down Expand Up @@ -298,7 +298,7 @@ function renderSetAvatar(int $id)

} catch(ISE $ex) {
$name = $album->getName();
$this->flashFail("err", "Неизвестная ошибка", "Не удалось сохранить фотографию.");
$this->flashFail("err", tr("error"), tr("error_when_uploading_photo"));
}
}
$this->returnJson([
Expand Down Expand Up @@ -350,7 +350,7 @@ function renderStatistics(int $id): void
$this->assertUserLoggedIn();

if(!eventdb())
$this->flashFail("err", "Ошибка подключения", "Не удалось подключится к службе телеметрии.");
$this->flashFail("err", tr("connection_error"), tr("connection_error_desc"));

$club = $this->clubs->get($id);
if(!$club->canBeModifiedBy($this->user->identity))
Expand Down
6 changes: 3 additions & 3 deletions Web/Presenters/NotesPresenter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ function renderEdit(int $owner, int $note_id): void
if(!$note || $note->getOwner()->getId() !== $owner || $note->isDeleted())
$this->notFound();
if(is_null($this->user) || !$note->canBeModifiedBy($this->user->identity))
$this->flashFail("err", "Ошибка доступа", "Недостаточно прав для модификации данного ресурса.");
$this->flashFail("err", tr("error_access_denied_short"), tr("error_access_denied"));
$this->template->note = $note;

if($_SERVER["REQUEST_METHOD"] === "POST") {
Expand Down Expand Up @@ -135,11 +135,11 @@ function renderDelete(int $owner, int $id): void
if(!$note) $this->notFound();
if($note->getOwner()->getId() . "_" . $note->getId() !== $owner . "_" . $id || $note->isDeleted()) $this->notFound();
if(is_null($this->user) || !$note->canBeModifiedBy($this->user->identity))
$this->flashFail("err", "Ошибка доступа", "Недостаточно прав для модификации данного ресурса.");
$this->flashFail("err", tr("error_access_denied_short"), tr("error_access_denied"));

$name = $note->getName();
$note->delete();
$this->flash("succ", "Заметка удалена", "Заметка \"$name\" была успешно удалена.");
$this->flash("succ", tr("note_is_deleted"), tr("note_x_is_now_deleted", $name));
$this->redirect("/notes" . $this->user->id);
}
}
Loading

0 comments on commit 468eba8

Please sign in to comment.