Skip to content

Dashboard: move favorite translations to dashboard for ILIAS 12 #11418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iszmais wants to merge 1 commit into
base: trunk
Choose a base branch
from
+17 −14
Open

Dashboard: move favorite translations to dashboard for ILIAS 12 #11418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/ILIAS/Dashboard/Block/classes/class.ilDashboardBlockGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,14 +607,14 @@ public function getItemGroups(): array
public function addToDeskObject(): void
{
$this->favourites_manager->add($this->user->getId(), $this->requested_item_ref_id);
$this->main_tpl->setOnScreenMessage('success', $this->lng->txt('rep_added_to_favourites'), true);
$this->main_tpl->setOnScreenMessage('success', $this->lng->txt('added_to_favourites'), true);
$this->ctrl->redirectByClass(ilDashboardGUI::class, 'show');
}

public function removeFromDeskObject(): void
{
$this->favourites_manager->remove($this->user->getId(), $this->requested_item_ref_id);
$this->main_tpl->setOnScreenMessage('success', $this->lng->txt('rep_removed_from_favourites'), true);
$this->main_tpl->setOnScreenMessage('success', $this->lng->txt('removed_from_favourites'), true);
$this->ctrl->redirectByClass(ilDashboardGUI::class, 'show');
}

Expand Down
8 changes: 4 additions & 4 deletions components/ILIAS/ILIASObject/classes/class.ilObjectGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2053,17 +2053,17 @@ public function addToDeskObject(): void
$this->user->getId(),
$this->request_wrapper->retrieve("item_ref_id", $this->refinery->kindlyTo()->int())
);
$this->lng->loadLanguageModule("rep");
$this->tpl->setOnScreenMessage("success", $this->lng->txt("rep_added_to_favourites"), true);
$this->lng->loadLanguageModule("dash");
$this->tpl->setOnScreenMessage("success", $this->lng->txt("added_to_favourites"), true);
$this->ctrl->redirectToURL(ilLink::_getLink($this->requested_ref_id));
}

public function removeFromDeskObject(): void
{
$this->lng->loadLanguageModule("rep");
$item_ref_id = $this->request_wrapper->retrieve("item_ref_id", $this->refinery->kindlyTo()->int());
$this->favourites->remove($this->user->getId(), $item_ref_id);
$this->tpl->setOnScreenMessage("success", $this->lng->txt("rep_removed_from_favourites"), true);
$this->lng->loadLanguageModule("dash");
$this->tpl->setOnScreenMessage("success", $this->lng->txt("removed_from_favourites"), true);
$this->ctrl->redirectToURL(ilLink::_getLink($this->requested_ref_id));
}

Expand Down
5 changes: 3 additions & 2 deletions components/ILIAS/ILIASObject/classes/class.ilObjectListGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1808,15 +1808,16 @@ public function insertSubscribeCommand(): void
$this->ctrl->setParameter($this->container_obj, 'type', $type);
$this->ctrl->setParameter($this->container_obj, 'item_ref_id', $this->getCommandId());

$this->lng->loadLanguageModule('dash');
if (!$this->fav_manager->ifIsFavourite($this->user->getId(), $this->getCommandId())) {
// Pass type and object ID to ilAccess to improve performance
if ($this->checkCommandAccess('read', '', $this->ref_id, $this->type, $this->obj_id)) {
$cmd_link = $this->ctrl->getLinkTarget($this->container_obj, 'addToDesk');
$this->insertCommand($cmd_link, $this->lng->txt('rep_add_to_favourites'));
$this->insertCommand($cmd_link, $this->lng->txt('add_to_favourites'));
}
} else {
$cmd_link = $this->ctrl->getLinkTarget($this->container_obj, 'removeFromDesk');
$this->insertCommand($cmd_link, $this->lng->txt('rep_remove_from_favourites'));
$this->insertCommand($cmd_link, $this->lng->txt('remove_from_favourites'));
}

$this->ctrl->clearParameters($this->container_obj);
Expand Down
7 changes: 4 additions & 3 deletions lang/ilias_de.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8088,6 +8088,8 @@ crs#:#tutorial_support_block_title#:#Kontaktperson
crs#:#user_fields#:#Angaben des Persönlichen Profils
crsv#:#crsv_create#:#Kurszertifikat erstellen
crsv#:#crsv_create_info#:#Wählen Sie einen Kurs, für den Sie ein Zertifikat benötigen
dash#:#add_to_favourites#:#Zu Favoriten hinzufügen
dash#:#added_to_favourites#:#Das Objekt wurde den Favoriten hinzugefügt.
dash#:#dash_activation#:#Aktivierung
dash#:#dash_added_to_favs#:#Der Eintrag wurde zu den persönlichen Favoriten hinzugefügt.
dash#:#dash_avail_presentation#:#Verfügbare Präsentationen
Expand Down Expand Up @@ -8125,7 +8127,6 @@ dash#:#dash_item_removed#:#Der Eintrag wurde aus der Liste entfernt.
dash#:#dash_learning_sequences#:#Meine Lernsequenzen
dash#:#dash_list#:#Liste
dash#:#dash_main_panel#:#Hauptbereich
dash#:#dash_make_favourite#:#Zu Favoriten hinzufügen
dash#:#dash_manual_new_item_pos#:#Position von neuen Objekten
dash#:#dash_manual_new_item_pos_bot#:#Unten
dash#:#dash_manual_new_item_pos_top#:#Oben
Expand Down Expand Up @@ -8153,6 +8154,8 @@ dash#:#dash_view_courses_groups#:#Block ‘Meine Kurse und Gruppen’
dash#:#dash_view_favourites#:#Block ‘Favoriten’
dash#:#favourites_disabled_info#:#Das Setzen von Favoriten ist deaktiviert. Sie können dieses in den Magazin-Einstellungen ändern.
dash#:#memberships_disabled_info#:#Das Setzen von Mitgliedschaften ist deaktiviert. Sie können dieses in den Kurs-Einstellungen ändern.
dash#:#remove_from_favourites#:#Von Favoriten entfernen
dash#:#removed_from_favourites#:#Das Objekt wurde aus den Favoriten entfernt.
dash#:#topitem_block#:#Block
dateplaner#:#Fr_long#:#Freitag
dateplaner#:#Fr_short#:#Fr
Expand Down Expand Up @@ -15147,7 +15150,6 @@ rep#:#rep_add_new_def_grp_organisation#:#Organisation
rep#:#rep_add_new_def_grp_templates#:#Vorlagen
rep#:#rep_add_to_favourites#:#Zu Favoriten hinzufügen
rep#:#rep_added_rec_content#:#Empfohlener Inhalt wurde hinzugefügt.
rep#:#rep_added_to_favourites#:#Das Objekt wurde den Favoriten hinzugefügt.
rep#:#rep_allowed_types#:#Allowed Types
rep#:#rep_breadcr_crs#:#Brotkrumennavigation beginnt mit Kurs
rep#:#rep_breadcr_crs_config#:#Konfiguration
Expand Down Expand Up @@ -15204,7 +15206,6 @@ rep#:#rep_rec_content_removed#:#Empfohlener Inhalt wurde entfernt.
rep#:#rep_recommended_content#:#Empfohlene Inhalte
rep#:#rep_remove_from_favourites#:#Von Favoriten entfernen
rep#:#rep_remove_rec_content#:#Sollen die folgenden Empfehlungen wirklich entfernt werden? Die entsprechenden Inhalte bleiben weiterhin erhalten.
rep#:#rep_removed_from_favourites#:#Das Objekt wurde aus den Favoriten entfernt.
rep#:#rep_target_location#:#Zielort
rep#:#rep_target_location_info#:#Bitte wählen sie den Zielort aus, an dem die ausgewählten Objekte wiederhergestellt werden sollen.
rep#:#rep_time_based_availability#:#Zeitlich begrenzte Verfügbarkeit
Expand Down
7 changes: 4 additions & 3 deletions lang/ilias_en.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8089,6 +8089,8 @@ crs#:#tutorial_support_block_title#:#Contact Person
crs#:#user_fields#:#User Fields
crsv#:#crsv_create#:#Create Course Certificate
crsv#:#crsv_create_info#:#Select a completed course to generate a certificate for it
dash#:#add_to_favourites#:#Add to Favourites
dash#:#added_to_favourites#:#The item has been added to your favourites.
dash#:#dash_activation#:#activation
dash#:#dash_added_to_favs#:#Recommendation has been added to personal favourites.
dash#:#dash_avail_presentation#:#Available Presentations
Expand Down Expand Up @@ -8126,7 +8128,6 @@ dash#:#dash_item_removed#:#Recommendation has been removed from the list.
dash#:#dash_learning_sequences#:#My Learning Sequences
dash#:#dash_list#:#List
dash#:#dash_main_panel#:#Main Panel
dash#:#dash_make_favourite#:#Add to Favourites
dash#:#dash_manual_new_item_pos#:#Position of New Objects
dash#:#dash_manual_new_item_pos_bot#:#Bottom
dash#:#dash_manual_new_item_pos_top#:#Top
Expand Down Expand Up @@ -8154,6 +8155,8 @@ dash#:#dash_view_courses_groups#:#Section ‘My Courses and Groups’
dash#:#dash_view_favourites#:#Section ‘Favourites’
dash#:#favourites_disabled_info#:#Add to favorites is deactivated. You may change this inside the repository settings.
dash#:#memberships_disabled_info#:#Subscriptions are deactivated. You may change this inside the course settings.
dash#:#remove_from_favourites#:#Remove from Favourites
dash#:#removed_from_favourites#:#The item has been removed from your favourites.
dash#:#topitem_block#:#Block
dateplaner#:#Fr_long#:#Friday
dateplaner#:#Fr_short#:#Fr
Expand Down Expand Up @@ -15121,7 +15124,6 @@ rep#:#rep_add_new_def_grp_organisation#:#Organisation
rep#:#rep_add_new_def_grp_templates#:#Templates
rep#:#rep_add_to_favourites#:#Add to Favourites
rep#:#rep_added_rec_content#:#Recommended content has been added.
rep#:#rep_added_to_favourites#:#The item has been added to your favourites.
rep#:#rep_allowed_types#:#Allowed Types
rep#:#rep_breadcr_crs#:#Breadcrumb starts with course
rep#:#rep_breadcr_crs_config#:#Configuration
Expand Down Expand Up @@ -15178,7 +15180,6 @@ rep#:#rep_rec_content_removed#:#Recommended content has been removed.
rep#:#rep_recommended_content#:#Recommended Content
rep#:#rep_remove_from_favourites#:#Remove from Favourites
rep#:#rep_remove_rec_content#:#Are you sure you want to remove the following recommended content?
rep#:#rep_removed_from_favourites#:#The item has been removed from your favourites.
rep#:#rep_target_location#:#Target Location
rep#:#rep_target_location_info#:#Bitte wählen Sie nun das Ziel aus, an dem die ausgewählten Objekte wiederhergestellt werden sollen.
rep#:#rep_time_based_availability#:#Limited Availability Period
Expand Down
Loading