From d5c352db13665bfcdb2eef05f5182e1a9f2a0fa1 Mon Sep 17 00:00:00 2001 From: "E. S." Date: Wed, 13 Mar 2024 15:25:13 +0000 Subject: [PATCH] articles upd --- composer.json | 4 +++- lib/files.php | 5 ++--- skin/main.phps | 4 ++-- strings/main.yaml | 3 +++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 7649af7..22b197f 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,9 @@ "ext-gd": "*", "ext-mysqli": "*", "ext-json": "*", - "ext-yaml": "*" + "ext-yaml": "*", + "ext-gmp": "*", + "ext-memcached": "*" }, "repositories": [ { diff --git a/lib/files.php b/lib/files.php index d833e73..39716e5 100644 --- a/lib/files.php +++ b/lib/files.php @@ -71,11 +71,10 @@ class CollectionItem implements FilesItemInterface { public function getUrl(): string { global $config; switch ($this->collection) { - case FilesCollection::MercureDeFrance: - case FilesCollection::WilliamFriedman: - return '/files/'.$this->collection->value.'/'; case FilesCollection::Baconiana: return 'https://'.$config['files_domain'].'/Baconiana/'; + default: + return '/files/'.$this->collection->value.'/'; } } public function getSize(): ?int { return null; } diff --git a/skin/main.phps b/skin/main.phps index 192bb63..4e49480 100644 --- a/skin/main.phps +++ b/skin/main.phps @@ -110,8 +110,8 @@ HTML; function articlesRightLinks($ctx, string $selected_lang) { $links = [ - ['url' => $selected_lang != 'en' ? '/articles/' : null, 'label' => 'en'], - ['url' => $selected_lang != 'ru' ? '/articles/?lang=ru' : null, 'label' => 'ru'], + ['url' => $selected_lang != 'en' ? '/articles/' : null, 'label' => lang('lang_en')], + ['url' => $selected_lang != 'ru' ? '/articles/?lang=ru' : null, 'label' => lang('lang_ru')], ]; if (is_admin()) { $links[] = ['url' => '/articles/write/?lang='.$selected_lang, 'label' => 'write']; diff --git a/strings/main.yaml b/strings/main.yaml index 7eab02a..0d369ff 100644 --- a/strings/main.yaml +++ b/strings/main.yaml @@ -17,6 +17,9 @@ save: "Save" info_saved: 'Information saved.' toc: 'Table of Contents' +lang_en: "English" +lang_ru: "Русский" + # blog blog_new_post: "New post" blog_view_post: "View post"