Skip to content
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

Restart server with confirmation. Username next to Logout. #1658

Merged
merged 6 commits into from
Nov 9, 2023
Merged

Restart server with confirmation. Username next to Logout. #1658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
70ceec7
Update pl.json
mkz212 Nov 8, 2023
41186a3
Update layout.component.html
mkz212 Nov 8, 2023
d37a3d3
Update pl.json
mkz212 Nov 8, 2023
8fb7f2d
Update pl.json
mkz212 Nov 8, 2023
578e362
Update layout.component.html
mkz212 Nov 8, 2023
44967c3
Merge branch 'beta-4.52.2' into patch-12
donavanbecker Nov 9, 2023
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 ui/src/app/shared/layout/layout.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</li>
<li class="nav-item waves-effect waves-light" routerLinkActive="active" placement="bottom"
ngbTooltip="{{'menu.tooltip_restart' | translate}}" container="body">
<a class="nav-link" routerLink="/restart" aria-label="Restart Homebridge">
<a class="nav-link" href="javascript:void(0)" (click)="shutdownServer()" aria-label="Restart Homebridge">
<i #restartHomebridgeIcon class="fas fa-fw fa-power-off nav-menu-icon"></i>
</a>
</li>
Expand Down Expand Up @@ -98,7 +98,7 @@
{{ 'menu.linux.label_shutdown_server' | translate }}
</a>
<a href="javascript:void(0)" class="dropdown-item" (click)="$auth.logout()" *ngIf="$settings.formAuth">
{{ 'menu.tooltip_logout' | translate }}
{{ 'menu.tooltip_logout' | translate }} - {{ user.username }}
</a>
</div>
</li>
Expand Down
8 changes: 4 additions & 4 deletions ui/src/i18n/pl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,10 @@
"menu.label_ui_settings": "UI Ustawienia",
"menu.linux.label_logs": "Logi",
"menu.linux.label_restart_server": "Zrestartuj serwer",
"menu.linux.label_shutdown_server": "Zamknij serwer",
"menu.linux.label_shutdown_server": "Wyłącz serwer",
"menu.linux.label_terminal": "Terminal",
"menu.tooltip_logout": "Wyloguj",
"menu.tooltip_restart": "Uruchom ponownie",
"menu.tooltip_restart": "Zrestartuj serwer",
"menu.tooltip_user_accounts": "Użytkownicy",
"menu.tooltip_view_logs": "Pokaż Logi",
"platform.docker.restart_container.message_run_with_restart_always": "Upewnij się, że uruchamiasz kontener Docker z parametrem <strong>--restart=always</strong>",
Expand All @@ -153,14 +153,14 @@
"platform.docker.startup_script.toast_script_must_use_hashbang": "Skrypt musi używać '#!/bin/sh'.",
"platform.docker.startup_script.toast_title_script_error": "Błąd skryptu",
"platform.docker.startup_script.toast_title_script_saved": "Skrypt startowy został zapisany",
"platform.linux.restart.confirmation": "Jesteś pewny że chcesz zrestartować system operacyjny?",
"platform.linux.restart.confirmation": "Na pewno zrestartować serwer?",
"platform.linux.restart.message_please_wait_while_server_restarts": "Poczekaj, ta strona zostanie automatycznie odświeżona, gdy Homebridge powróci online.",
"platform.linux.restart.message_server_taking_long_time_to_restart": "Ponowne uruchomienie serwera zajmuje dużo czasu. Może być konieczne ręczne zresetowanie serwera.",
"platform.linux.restart.title_restarting_server": "Ponowne uruchamianie serwera",
"platform.linux.restart.toast_server_restart_error": "Wystąpił błąd podczas wysyłania polecenia restartu serwera",
"platform.linux.restart.toast_server_restarted": "Serwer uruchomił się ponownie",
"platform.linux.restart.toast_server_taking_long_time_to_come_online": "Serwer potrzebuje więcej czasu, by powrócić do trybu online",
"platform.linux.shutdown.confirmation": "Jesteś pewny że chcesz całkowicie wyłączyć system operacyjny?",
"platform.linux.shutdown.confirmation": "Na pewno całkowicie wyłączyć serwer?",
"platform.linux.shutdown.message_server_will_power_down": "Serwer wkrótce się wyłączy.",
"platform.linux.shutdown.title_shutting_down_server": "Wyłączanie serwera",
"platform.version.message_service_restart_required": "UWAGA: Homebridge UI v{{ uiVersion }} zainstalowane, ale serwer nadal pracuje v{{ serverVersion }}.",
Expand Down
Loading