From 6726771874d010e7932b23c9618f98a9f043064e Mon Sep 17 00:00:00 2001 From: kosfurler Date: Sat, 19 Feb 2022 16:07:15 +0300 Subject: [PATCH 1/3] Groups: Fix info table disapperiance in group list --- Web/Presenters/templates/User/Groups.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Web/Presenters/templates/User/Groups.xml b/Web/Presenters/templates/User/Groups.xml index 1db19dfa..b8f138dd 100644 --- a/Web/Presenters/templates/User/Groups.xml +++ b/Web/Presenters/templates/User/Groups.xml @@ -53,7 +53,7 @@ {block name}{/block} -{block infoTable} +{block infotable} From a1a18b7255bc65da0af30c572d10cc66a0640d7e Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Sat, 19 Feb 2022 20:31:19 +0300 Subject: [PATCH 2/3] Groups: Fix the attachment to the left menu --- Web/Presenters/templates/User/Groups.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Web/Presenters/templates/User/Groups.xml b/Web/Presenters/templates/User/Groups.xml index b8f138dd..3a72d45b 100644 --- a/Web/Presenters/templates/User/Groups.xml +++ b/Web/Presenters/templates/User/Groups.xml @@ -74,13 +74,12 @@ {block actions} {var clubPinned = $thisUser->isClubPinned($x)} - {if $x->canBeModifiedBy($thisUser ?? NULL)}
{_check_community} - {if ($clubPinned || $thisUser->getPinnedClubCount() <= 10)} - + {if ($clubPinned || $thisUser->getPinnedClubCount() <= 10) && $x->canBeModifiedBy($thisUser ?? NULL)} + {if $clubPinned} {_remove_from_left_menu} {else} @@ -95,7 +94,6 @@
- {/if} {/block} {block bottom} From 7b78becfbd22325d4532fe2a27ec544f0090b2ac Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Sat, 19 Feb 2022 20:50:06 +0300 Subject: [PATCH 3/3] Global: Fix hiccups and localize some strings --- Web/Presenters/templates/Photos/AlbumList.xml | 34 +++++++++---------- Web/Presenters/templates/User/Friends.xml | 4 +-- Web/Presenters/templates/User/Groups.xml | 4 ++- Web/Presenters/templates/Videos/List.xml | 10 +++--- locales/am.strings | 2 +- locales/by.strings | 2 +- locales/by_lat.strings | 2 +- locales/de.strings | 2 +- locales/en.strings | 20 ++++++++--- locales/eo.strings | 2 +- locales/kk.strings | 2 +- locales/pl.strings | 2 +- locales/ru.strings | 2 +- locales/ru_old.strings | 2 +- locales/sr_cyr.strings | 2 +- locales/sr_lat.strings | 2 +- locales/su.strings | 2 +- locales/tr.strings | 2 +- locales/ua.strings | 2 +- locales/udm.strings | 2 +- 20 files changed, 58 insertions(+), 44 deletions(-) diff --git a/Web/Presenters/templates/Photos/AlbumList.xml b/Web/Presenters/templates/Photos/AlbumList.xml index 15e6c96b..f74f319c 100644 --- a/Web/Presenters/templates/Photos/AlbumList.xml +++ b/Web/Presenters/templates/Photos/AlbumList.xml @@ -5,28 +5,28 @@ {block title}{_"albums"} {$owner->getCanonicalName()}{/block} {block header} - {if isset($thisUser) && $thisUser->getId() == $owner->getId()} - {_my_photos} - {else} - - {$owner->getCanonicalName()} - » - {_albums} - {/if} + {if isset($thisUser) && $thisUser->getId() == $owner->getId()} + {_my_photos} + {else} + + {$owner->getCanonicalName()} + » + {_albums} + {/if} {/block} {block size}
- {if !is_null($thisUser) && $owner->getId() === $thisUser->getId()} - {tr("albums_list", $count)} - {else} - {tr("albums", $count)} - {/if} - -  |  - {_create_album} - + {if !is_null($thisUser) && $owner->getId() === $thisUser->getId()} + {tr("albums_list", $count)} + {else} + {tr("albums", $count)} + {/if} + +  |  + {_create_album} +
{/block} diff --git a/Web/Presenters/templates/User/Friends.xml b/Web/Presenters/templates/User/Friends.xml index 3314e6b7..344c34be 100644 --- a/Web/Presenters/templates/User/Friends.xml +++ b/Web/Presenters/templates/User/Friends.xml @@ -52,12 +52,12 @@
- Входящие + {_incoming_req}
- Исходящие + {_outcoming_req}
diff --git a/Web/Presenters/templates/User/Groups.xml b/Web/Presenters/templates/User/Groups.xml index 3a72d45b..4006cb92 100644 --- a/Web/Presenters/templates/User/Groups.xml +++ b/Web/Presenters/templates/User/Groups.xml @@ -74,11 +74,12 @@ {block actions} {var clubPinned = $thisUser->isClubPinned($x)} + {if $x->canBeModifiedBy($thisUser ?? NULL)}
{_check_community} - {if ($clubPinned || $thisUser->getPinnedClubCount() <= 10) && $x->canBeModifiedBy($thisUser ?? NULL)} + {if ($clubPinned || $thisUser->getPinnedClubCount() <= 10)} {if $clubPinned} {_remove_from_left_menu} @@ -94,6 +95,7 @@
+ {/if} {/block} {block bottom} diff --git a/Web/Presenters/templates/Videos/List.xml b/Web/Presenters/templates/Videos/List.xml index 9a51fc9d..b9eac543 100644 --- a/Web/Presenters/templates/Videos/List.xml +++ b/Web/Presenters/templates/Videos/List.xml @@ -13,11 +13,11 @@ {block size}
- {tr("videos", $count)} - -  |  - {_upload_video} - + {tr("videos", $count)} + +  |  + {_upload_video} +
{/block} diff --git a/locales/am.strings b/locales/am.strings index cd901a44..54985e59 100644 --- a/locales/am.strings +++ b/locales/am.strings @@ -208,7 +208,7 @@ "outcoming_req" = "Հայցեր"; "req" = "Հայցեր"; -"firends_zero" = "Ոչ մի ընկեր չկա"; +"friends_zero" = "Ոչ մի ընկեր չկա"; "friends_one" = "$1 ընկեր"; "friends_few" = "$1 ընկեր"; "friends_many" = "$1 հատ ընկեր"; diff --git a/locales/by.strings b/locales/by.strings index edf272f6..b1e70c1e 100644 --- a/locales/by.strings +++ b/locales/by.strings @@ -124,7 +124,7 @@ "outcoming_req" = "Заяўкі"; "req" = "Заяўкі"; -"firends_zero" = "Няма сяброў"; +"friends_zero" = "Няма сяброў"; "friends_one" = "$1 сябар"; "friends_few" = "$1 аднаго"; "friends_many" = "$1 сяброў"; diff --git a/locales/by_lat.strings b/locales/by_lat.strings index 4056999f..d0db1264 100644 --- a/locales/by_lat.strings +++ b/locales/by_lat.strings @@ -132,7 +132,7 @@ "outcoming_req" = "Zajavy"; "req" = "Zajavy"; -"firends_zero" = "Niama siabroŭ"; +"friends_zero" = "Niama siabroŭ"; "friends_one" = "$1 siabar"; "friends_few" = "$1 siabra"; "friends_many" = "$1 siabroŭ"; diff --git a/locales/de.strings b/locales/de.strings index 0fdf1b38..4980a03e 100644 --- a/locales/de.strings +++ b/locales/de.strings @@ -151,7 +151,7 @@ "outcoming_req" = "Anfragen"; "req" = "Anfragen"; -"firends_zero" = "Keine Freunde"; +"friends_zero" = "Keine Freunde"; "friends_one" = "$1 Freund"; "friends_other" = "$1 Freunde"; diff --git a/locales/en.strings b/locales/en.strings index 1cfab93a..3adcd485 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -199,14 +199,22 @@ "friends_reject" = "Reject request"; "friends_accept" = "Accept request"; "send_message" = "Send a message"; -"incoming_req" = "Subscribers"; -"outcoming_req" = "Requests"; +"incoming_req" = "Pending"; +"outcoming_req" = "Outgoing"; "req" = "Requests"; -"firends_zero" = "No friends"; +"req_zero" = "No requests were found..."; +"req_one" = "Found $1 request"; +"req_other" = "Found $1 requests"; + +"friends_zero" = "No friends"; "friends_one" = "$1 friend"; "friends_other" = "$1 friends"; +"friends_list_zero" = "You have no friends yet"; +"friends_list_one" = "You have $1 friend"; +"friends_list_other" = "You have $1 friends"; + "followers_zero" = "No followers"; "followers_one" = "$1 follower"; "followers_other" = "$1 followers"; @@ -308,6 +316,10 @@ "albums_one" = "$1 album"; "albums_other" = "$1 albums"; +"albums_list_zero" = "You don't have any albums"; +"albums_list_one" = "You have one album"; +"albums_list_other" = "You have $1 albums"; + /* Notes */ "notes" = "Notes"; @@ -747,7 +759,7 @@ "information_-2" = "Login success"; "no_data" = "No data"; -"no_data_description" = "There is no data."; +"no_data_description" = "There is nothing here... yet..."; "error" = "Error"; "error_shorturl" = "This short address is already owned."; diff --git a/locales/eo.strings b/locales/eo.strings index d01f17c6..b57d998f 100644 --- a/locales/eo.strings +++ b/locales/eo.strings @@ -189,7 +189,7 @@ "outcoming_req" = "Petoj"; "req" = "Petoj"; -"firends_zero" = "Neniuj amikoj"; +"friends_zero" = "Neniuj amikoj"; "friends_one" = "$1 amiko"; "friends_few" = "$1 amikoj"; "friends_many" = "$1 amikoj"; diff --git a/locales/kk.strings b/locales/kk.strings index 449eb878..72665ff6 100644 --- a/locales/kk.strings +++ b/locales/kk.strings @@ -206,7 +206,7 @@ "outcoming_req" = "Өтінімдер"; "req" = "Өтінімдер"; -"firends_zero" = "Достарыңыз жоқ"; +"friends_zero" = "Достарыңыз жоқ"; "friends_one" = "$1 дос"; "friends_other" = "$1 дос"; diff --git a/locales/pl.strings b/locales/pl.strings index 5012cf9d..cf2fafb4 100644 --- a/locales/pl.strings +++ b/locales/pl.strings @@ -200,7 +200,7 @@ "outcoming_req" = "Zgłoszenie"; "req" = "Zgłoszenie"; -"firends_zero" = "Ani jednego przyjaciela"; +"friends_zero" = "Ani jednego przyjaciela"; "friends_one" = "$1 przyjaciel"; "friends_few" = "$1 przyjaciela"; "friends_many" = "$1 przyjaciół"; diff --git a/locales/ru.strings b/locales/ru.strings index 515495bd..74579576 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -208,7 +208,7 @@ "req_zero" = "Не найдено ни одной заявки..."; "req_one" = "Найдена $1 заявка"; -"req_few" = "Найлено $1 заявки"; +"req_few" = "Найдено $1 заявки"; "req_many" = "Найдено $1 заявки"; "req_other" = "Найдено $1 заявок"; diff --git a/locales/ru_old.strings b/locales/ru_old.strings index 9e31c72f..c86967e4 100644 --- a/locales/ru_old.strings +++ b/locales/ru_old.strings @@ -190,7 +190,7 @@ "outcoming_req" = "Входящіе прошенія"; "req" = "Исходящіе прошенія"; -"firends_zero" = "Ни одного знакомца"; +"friends_zero" = "Ни одного знакомца"; "friends_one" = "$1 знакомецъ"; "friends_few" = "$1 знакомца"; "friends_many" = "$1 знакомцевъ"; diff --git a/locales/sr_cyr.strings b/locales/sr_cyr.strings index 55937634..2ce12e27 100644 --- a/locales/sr_cyr.strings +++ b/locales/sr_cyr.strings @@ -124,7 +124,7 @@ "outcoming_req" = "Захтеви"; "req" = "Захтеви"; -"firends_zero" = "Нема ниједног пријатеља"; +"friends_zero" = "Нема ниједног пријатеља"; "friends_one" = "$1 пријатељ"; "friends_few" = "$1 пријатеља"; "friends_many" = "$1 пријатеља"; diff --git a/locales/sr_lat.strings b/locales/sr_lat.strings index 4fd69b31..0f382499 100644 --- a/locales/sr_lat.strings +++ b/locales/sr_lat.strings @@ -124,7 +124,7 @@ "outcoming_req" = "Zahtevi"; "req" = "Zahtevi"; -"firends_zero" = "Nema nijednog prijatelja"; +"friends_zero" = "Nema nijednog prijatelja"; "friends_one" = "$1 prijatelj"; "friends_few" = "$1 prijatelja"; "friends_many" = "$1 prijatelja"; diff --git a/locales/su.strings b/locales/su.strings index 39f630af..cf0bb16a 100644 --- a/locales/su.strings +++ b/locales/su.strings @@ -198,7 +198,7 @@ "outcoming_req" = "Заявки"; "req" = "Заявки"; -"firends_zero" = "Ни одного товарища"; +"friends_zero" = "Ни одного товарища"; "friends_one" = "$1 товарищ"; "friends_few" = "$1 товарища"; "friends_many" = "$1 товарищей"; diff --git a/locales/tr.strings b/locales/tr.strings index 1172c4da..8184a5df 100644 --- a/locales/tr.strings +++ b/locales/tr.strings @@ -153,7 +153,7 @@ "outcoming_req" = "İstekler"; "req" = "İstekler"; -"firends_zero" = "Arkadaş yok"; +"friends_zero" = "Arkadaş yok"; "friends_one" = "$1 arkadaş"; "friends_other" = "$1 arkadaş"; diff --git a/locales/ua.strings b/locales/ua.strings index fa1c671d..e7296ced 100644 --- a/locales/ua.strings +++ b/locales/ua.strings @@ -190,7 +190,7 @@ "outcoming_req" = "Заявки"; "req" = "Заявки"; -"firends_zero" = "Жодного друга"; +"friends_zero" = "Жодного друга"; "friends_one" = "$1 друг"; "friends_few" = "$1 друга"; "friends_many" = "$1 друзів"; diff --git a/locales/udm.strings b/locales/udm.strings index 17453f1e..497a4cc6 100644 --- a/locales/udm.strings +++ b/locales/udm.strings @@ -196,7 +196,7 @@ "outcoming_req" = "Заявки"; "req" = "Заявки"; -"firends_zero" = "Одӥг но эшъёс"; +"friends_zero" = "Одӥг но эшъёс"; "friends_one" = "$1 эшъёс"; "friends_few" = "$1 эшъёс"; "friends_many" = "$1 эшъёс";