Skip to content

Commit

Permalink
remove $locale in favor of Lang::get() (LycheeOrg#1490)
Browse files Browse the repository at this point in the history 
* remove $locale in favor of Lang::get()

* fix Lychee-front back to masteR
  • Loading branch information
@ildyria
ildyria committed Sep 4, 2022
1 parent bb98373 commit e80bf8c
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 51 deletions.
9 changes: 0 additions & 9 deletions app/Http/Controllers/IndexController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace App\Http\Controllers;

use App\Exceptions\ModelDBException;
use App\Facades\Lang;
use App\ModelFunctions\ConfigFunctions;
use App\ModelFunctions\SymLinkFunctions;
use App\Models\Configs;
Expand Down Expand Up @@ -40,9 +39,6 @@ public function __construct(ConfigFunctions $configFunctions, SymLinkFunctions $
public function show(): View
{
if (Configs::getValueAsBool('landing_page_enable')) {
$lang = Lang::get_lang();
$lang['language'] = Configs::getValueAsString('lang');

$infos = $this->configFunctions->get_pages_infos();

$menus = Page::menu()->get();
Expand All @@ -55,7 +51,6 @@ public function show(): View
$page_config['display_socials'] = false;

return view('landing', [
'locale' => $lang,
'title' => $title,
'infos' => $infos,
'menus' => $menus,
Expand Down Expand Up @@ -94,17 +89,13 @@ public function gallery(): View
$this->symLinkFunctions->remove_outdated();
$infos = $this->configFunctions->get_pages_infos();

$lang = Lang::get_lang();
$lang['language'] = Configs::getValueAsString('lang');

$title = Configs::getValueAsString('site_title');
$rss_enable = Configs::getValueAsBool('rss_enable');
$page_config = [];
$page_config['show_hosted_by'] = true;
$page_config['display_socials'] = Configs::getValueAsBool('display_social_in_gallery');

return view('gallery', [
'locale' => $lang,
'title' => $title,
'infos' => $infos,
'page_config' => $page_config,
Expand Down
74 changes: 37 additions & 37 deletions resources/views/gallery.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,140 +23,140 @@
<header class="header">
<div class="header__toolbar header__toolbar--public">

<a class="button" id="button_signin" title="{{ $locale['SIGN_IN'] }}" data-tabindex="{{ Helpers::data_index_r() }}">
<a class="button" id="button_signin" title="{{ Lang::get('SIGN_IN') }}" data-tabindex="{{ Helpers::data_index_r() }}">
<x-iconic icon='account-login' />
</a>

<a class="header__title" data-tabindex="{{ Helpers::data_index() }}"></a>

<div class="header__search__field">
<input class="header__search" type="text" name="search" placeholder="{{ $locale['SEARCH'] }}" data-tabindex="{{ Helpers::data_index() }}">
<input class="header__search" type="text" name="search" placeholder="{{ Lang::get('SEARCH') }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="header__clear">&times;</a>
</div>
<a class="button button--map-albums" title="{{ $locale['DISPLAY_FULL_MAP'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button button--map-albums" title="{{ Lang::get('DISPLAY_FULL_MAP') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic"><use xlink:href="#map"></use></svg>
</a>
{{-- <a class="header__hostedwith">{{ $locale['HOSTED_WITH_LYCHEE'] }}</a>--}}
{{-- <a class="header__hostedwith">{{ Lang::get('HOSTED_WITH_LYCHEE') }}</a>--}}

</div>
<div class="header__toolbar header__toolbar--albums">

<a class="button" id="button_settings" title="{{ $locale['SETTINGS'] }}" data-tabindex="{{ Helpers::data_index_r() }}">
<a class="button" id="button_settings" title="{{ Lang::get('SETTINGS') }}" data-tabindex="{{ Helpers::data_index_r() }}">
<svg class="iconic"><use xlink:href="#cog"></use></svg>
</a>

<a class="header__title" data-tabindex="{{ Helpers::data_index() }}"></a>
<div class="header__search__field">
<input class="header__search" type="text" name="search" placeholder="{{ $locale['SEARCH'] }}" data-tabindex="{{ Helpers::data_index() }}">
<input class="header__search" type="text" name="search" placeholder="{{ Lang::get('SEARCH') }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="header__clear">&times;</a>
</div>
<a class="header__divider"></a>
<a class="button button--map-albums" title="{{ $locale['DISPLAY_FULL_MAP'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button button--map-albums" title="{{ Lang::get('DISPLAY_FULL_MAP') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic"><use xlink:href="#map"></use></svg>
</a>
<a class="button button_add" title="{{ $locale['ADD'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button button_add" title="{{ Lang::get('ADD') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic"><use xlink:href="#plus"></use></svg>
</a>

</div>
<div class="header__toolbar header__toolbar--album">

<a class="button" id="button_back_home" title="{{ $locale['CLOSE_ALBUM'] }}" data-tabindex="{{ Helpers::data_index_r() }}">
<a class="button" id="button_back_home" title="{{ Lang::get('CLOSE_ALBUM') }}" data-tabindex="{{ Helpers::data_index_r() }}">
<svg class="iconic"><use xlink:href="#chevron-left"></use></svg>
</a>

<a class="header__title" data-tabindex="{{ Helpers::data_index() }}"></a>

<a class="button button--eye" id="button_visibility_album" title="{{ $locale['VISIBILITY_ALBUM'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button button--eye" id="button_visibility_album" title="{{ Lang::get('VISIBILITY_ALBUM') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic iconic--eye"><use xlink:href="#eye"></use></svg>
</a>
<a class="button" id="button_sharing_album_users" title="{{ $locale['SHARING_ALBUM_USERS'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button" id="button_sharing_album_users" title="{{ Lang::get('SHARING_ALBUM_USERS') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic"><use xlink:href="#people"></use></svg>
</a>
<a class="button button--nsfw" id="button_nsfw_album" title="{{ $locale['ALBUM_MARK_NSFW'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button button--nsfw" id="button_nsfw_album" title="{{ Lang::get('ALBUM_MARK_NSFW') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic"><use xlink:href="#warning"></use></svg>
</a>
<a class="button button--share" id="button_share_album" title="{{ $locale['SHARE_ALBUM'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button button--share" id="button_share_album" title="{{ Lang::get('SHARE_ALBUM') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic ionicons"><use xlink:href="#share-ion"></use></svg>
</a>
<a class="button" id="button_archive" title="{{ $locale['DOWNLOAD_ALBUM'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button" id="button_archive" title="{{ Lang::get('DOWNLOAD_ALBUM') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic"><use xlink:href="#cloud-download"></use></svg>
</a>
<a class="button button--info" id="button_info_album" title="{{ $locale['ABOUT_ALBUM'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button button--info" id="button_info_album" title="{{ Lang::get('ABOUT_ALBUM') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic"><use xlink:href="#info"></use></svg>
</a>
<a class="button button--map" id="button_map_album" title="{{ $locale['DISPLAY_FULL_MAP'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button button--map" id="button_map_album" title="{{ Lang::get('DISPLAY_FULL_MAP') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic"><use xlink:href="#map"></use></svg>
</a>
<a class="button" id="button_move_album" title="{{ $locale['MOVE_ALBUM'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button" id="button_move_album" title="{{ Lang::get('MOVE_ALBUM') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic"><use xlink:href="#folder"></use></svg>
</a>
<a class="button" id="button_trash_album" title="{{ $locale['DELETE_ALBUM'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button" id="button_trash_album" title="{{ Lang::get('DELETE_ALBUM') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic"><use xlink:href="#trash"></use></svg>
</a>
<a class="button" id="button_fs_album_enter" title="{{ $locale['FULLSCREEN_ENTER'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button" id="button_fs_album_enter" title="{{ Lang::get('FULLSCREEN_ENTER') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic"><use xlink:href="#fullscreen-enter"></use></svg>
</a>
<a class="button" id="button_fs_album_exit" title="{{ $locale['FULLSCREEN_EXIT'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button" id="button_fs_album_exit" title="{{ Lang::get('FULLSCREEN_EXIT') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic"><use xlink:href="#fullscreen-exit"></use></svg>
</a>
<a class="header__divider"></a>
<a class="button button_add" title="{{ $locale['ADD'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button button_add" title="{{ Lang::get('ADD') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic"><use xlink:href="#plus"></use></svg>
</a>

</div>
<div class="header__toolbar header__toolbar--photo">

<a class="button" id="button_back" title="{{ $locale['CLOSE_PHOTO'] }}" data-tabindex="{{ Helpers::data_index_r() }}">
<a class="button" id="button_back" title="{{ Lang::get('CLOSE_PHOTO') }}" data-tabindex="{{ Helpers::data_index_r() }}">
<svg class="iconic"><use xlink:href="#chevron-left"></use></svg>
</a>

<a class="header__title" data-tabindex="{{ Helpers::data_index() }}"></a>

<a class="button button--star" id="button_star" title="{{ $locale['STAR_PHOTO'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button button--star" id="button_star" title="{{ Lang::get('STAR_PHOTO') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic"><use xlink:href="#star"></use></svg>
</a>
<a class="button button--eye" id="button_visibility" title="{{ $locale['VISIBILITY_PHOTO'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button button--eye" id="button_visibility" title="{{ Lang::get('VISIBILITY_PHOTO') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic"><use xlink:href="#eye"></use></svg>
</a>
<a class="button button--rotate" id="button_rotate_ccwise" title="{{ $locale['PHOTO_EDIT_ROTATECCWISE'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button button--rotate" id="button_rotate_ccwise" title="{{ Lang::get('PHOTO_EDIT_ROTATECCWISE') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic"><use xlink:href="#counterclockwise"></use></svg>
</a>
<a class="button button--rotate" id="button_rotate_cwise" title="{{ $locale['PHOTO_EDIT_ROTATECWISE'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button button--rotate" id="button_rotate_cwise" title="{{ Lang::get('PHOTO_EDIT_ROTATECWISE') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic"><use xlink:href="#clockwise"></use></svg>
</a>
<a class="button button--share" id="button_share" title="{{ $locale['SHARE_PHOTO'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button button--share" id="button_share" title="{{ Lang::get('SHARE_PHOTO') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic ionicons"><use xlink:href="#share-ion"></use></svg>
</a>
<a class="button button--info" id="button_info" title="{{ $locale['ABOUT_PHOTO'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button button--info" id="button_info" title="{{ Lang::get('ABOUT_PHOTO') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic"><use xlink:href="#info"></use></svg>
</a>
<a class="button button--map" id="button_map" title="{{ $locale['DISPLAY_FULL_MAP'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button button--map" id="button_map" title="{{ Lang::get('DISPLAY_FULL_MAP') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic"><use xlink:href="#map"></use></svg>
</a>
<a class="button" id="button_move" title="{{ $locale['MOVE'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button" id="button_move" title="{{ Lang::get('MOVE') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic"><use xlink:href="#folder"></use></svg>
</a>
<a class="button" id="button_trash" title="{{ $locale['DELETE'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button" id="button_trash" title="{{ Lang::get('DELETE') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic"><use xlink:href="#trash"></use></svg>
</a>
<a class="button" id="button_fs_enter" title="{{ $locale['FULLSCREEN_ENTER'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button" id="button_fs_enter" title="{{ Lang::get('FULLSCREEN_ENTER') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic"><use xlink:href="#fullscreen-enter"></use></svg>
</a>
<a class="button" id="button_fs_exit" title="{{ $locale['FULLSCREEN_EXIT'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button" id="button_fs_exit" title="{{ Lang::get('FULLSCREEN_EXIT') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic"><use xlink:href="#fullscreen-exit"></use></svg>
</a>
<a class="header__divider"></a>
<a class="button" id="button_more" title="{{ $locale['MORE'] }}" data-tabindex="{{ Helpers::data_index() }}">
<a class="button" id="button_more" title="{{ Lang::get('MORE') }}" data-tabindex="{{ Helpers::data_index() }}">
<svg class="iconic"><use xlink:href="#ellipses"></use></svg>
</a>

</div>

<div class="header__toolbar header__toolbar--map">

<a class="button" id="button_back_map" title="{{ $locale['CLOSE_MAP'] }}" data-tabindex="{{ Helpers::data_index_r() }}">
<a class="button" id="button_back_map" title="{{ Lang::get('CLOSE_MAP') }}" data-tabindex="{{ Helpers::data_index_r() }}">
<svg class="iconic"><use xlink:href="#chevron-left"></use></svg>
</a>

Expand All @@ -165,7 +165,7 @@
</div>

<div class="header__toolbar header__toolbar--config">
<a class="button" id="button_close_config" title="{{ $locale['CLOSE'] }}" data-tabindex="{{ Helpers::data_index_r() }}">
<a class="button" id="button_close_config" title="{{ Lang::get('CLOSE') }}" data-tabindex="{{ Helpers::data_index_r() }}">
<svg class="iconic"><use xlink:href="#plus"></use></svg>
</a>
<a class="header__title" data-tabindex="{{ Helpers::data_index() }}"></a>
Expand Down Expand Up @@ -195,7 +195,7 @@
<!-- Sidebar -->
<div class="sidebar">
<div class="sidebar__header">
<h1>{{ $locale['PHOTO_ABOUT'] }}</h1>
<h1>{{ Lang::get('PHOTO_ABOUT') }}</h1>
</div>
<div class="sidebar__wrapper"></div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions resources/views/includes/footer.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

@if($infos['copyright_enable'] == '1')
<p class="home_copyright">
{!! sprintf($locale['FOOTER_COPYRIGHT'], $infos['owner'], $infos['copyright_year']) !!}</p>
{!! sprintf(Lang::get('FOOTER_COPYRIGHT'), $infos['owner'], $infos['copyright_year']) !!}</p>
@endif

@if($infos['additional_footer_text'] != '')
Expand All @@ -18,6 +18,6 @@


@if($page_config['show_hosted_by'])
<p class="hosted_by"><a rel="noopener noreferrer" target="_blank" href="https://LycheeOrg.github.io" tabindex="-1">{{ $locale['HOSTED_WITH_LYCHEE'] }}</a></p>
<p class="hosted_by"><a rel="noopener noreferrer" target="_blank" href="https://LycheeOrg.github.io" tabindex="-1">{{ Lang::get('HOSTED_WITH_LYCHEE') }}</a></p>
@endif
</div>
2 changes: 1 addition & 1 deletion resources/views/layouts/gallery.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE HTML>
<html lang="{{ $locale['language'] }}" style="visibility: hidden;">
<html lang="{{ str_replace('_', '-', Lang::get_code()) }}" style="visibility: hidden;">
<head>
@include('includes.head')
</head>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/layouts/simple.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE HTML>
<html lang="{{ $locale['language'] }}">
<html lang="{{ str_replace('_', '-', Lang::get_code()) }}">
<head>
@include('includes.head')
</head>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/view.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<!-- Infobox -->
<div class="sidebar">
<div class="sidebar__header">
<h1>{{ $locale['PHOTO_ABOUT'] }}</h1>
<h1>{{ Lang::get('PHOTO_ABOUT') }}</h1>
</div>
<div class="sidebar__wrapper"></div>
</div>
Expand Down

0 comments on commit e80bf8c

Please sign in to comment.