mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix case sensitiv translations (#11463)

Browse Source 
On case insensitive systems, @lang('Auth') would match the auth.php file
and return an array instead of the string "Auth", causing a "Array to string conversion error"
This commit is contained in:
Jellyfrog
2020-04-22 23:57:30 +02:00
committed by GitHub
parent 59222847b9
commit d2a9ffdb83
11 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/about/index.blade.php
View File

@@ -156,7 +156,7 @@
<td class='text-right'>{{ $stat_events }}</td>
</tr>
<tr>
<td><i class='fa fa-fw fa-dashboard fa-lg icon-theme' aria-hidden='true'></i> <b>@lang('Sensors')</b></td>
<td><i class='fa fa-fw fa-dashboard fa-lg icon-theme' aria-hidden='true'></i> <b>@lang('sensors.title')</b></td>
<td class='text-right'>{{ $stat_sensors }}</td>
<td><i class='fa fa-fw fa-wifi fa-lg icon-theme' aria-hidden='true'></i> <b>@lang('Wireless Sensors')</b></td>
<td class='text-right'>{{ $stat_wireless }}</td>

6
resources/views/layouts/menu.blade.php
View File

@@ -118,7 +118,7 @@
aria-hidden="true"></i> @lang('Eventlog')</a></li>
@config('enable_syslog')
<li><a href="{{ url('syslog') }}"><i class="fa fa-clone fa-fw fa-lg"
aria-hidden="true"></i> @lang('Syslog')</a></li>
aria-hidden="true"></i> @lang('syslog.title')</a></li>
@endconfig
@config('graylog.server')
<li><a href="{{ url('graylog') }}"><i class="fa fa-clone fa-fw fa-lg"
@@ -388,7 +388,7 @@
<a href="{{ url('wireless') }}" class="dropdown-toggle" data-hover="dropdown"
data-toggle="dropdown"><i class="fa fa-wifi fa-fw fa-lg fa-nav-icons hidden-md"
aria-hidden="true"></i> <span
class="hidden-sm">@lang('Wireless')</span></a>
class="hidden-sm">@lang('wireless.title')</span></a>
<ul class="dropdown-menu">
@foreach($wireless_menu as $wireless_menu_entry)
<li><a href="{{ url('wireless/metric=' . $wireless_menu_entry->sensor_class) }}"><i class="fa fa-{{ $wireless_menu_entry->icon() }} fa-fw fa-lg" aria-hidden="true"></i> {{ $wireless_menu_entry->classDescr() }}</a></li>
@@ -526,7 +526,7 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"
style="margin-left:5px"><i class="fa fa-cog fa-fw fa-lg fa-nav-icons" aria-hidden="true"></i>
<span class="visible-xs-inline-block">@lang('Settings')</span></a>
<span class="visible-xs-inline-block">@lang('settings.title')</span></a>
<ul class="dropdown-menu">
@admin
<li><a href="{{ url('settings') }}"><i class="fa fa-cogs fa-fw fa-lg"

2
resources/views/settings/index.blade.php
View File

@@ -1,6 +1,6 @@
@extends('layouts.librenmsv1')
@section('title', __('Settings'))
@section('title', __('settings.title'))
@section('content')
<div class="container">

2
resources/views/user/index.blade.php
View File

@@ -15,7 +15,7 @@
<th data-column-id="username">@lang('Username')</th>
<th data-column-id="realname">@lang('Real Name')</th>
<th data-column-id="level" data-formatter="level" data-type="numeric">@lang('Access')</th>
<th data-column-id="auth_type" data-visible="{{ $multiauth ? 'true' : 'false' }}">@lang('Auth')</th>
<th data-column-id="auth_type" data-visible="{{ $multiauth ? 'true' : 'false' }}">@lang('auth.title')</th>
<th data-column-id="email">@lang('Email')</th>
@if(\LibreNMS\Authentication\LegacyAuth::getType() == 'mysql')
<th data-column-id="enabled" data-formatter="enabled">@lang('Enabled')</th>

4
resources/views/user/preferences.blade.php
View File

@@ -1,6 +1,6 @@
@extends('layouts.librenmsv1')
@section('title', __('Preferences'))
@section('title', __('preferences.title'))
@section('content')
<div class="container">
@@ -54,7 +54,7 @@
@endif
<div class="panel panel-default panel-condensed">
<div class="panel-heading">@lang('Preferences')</div>
<div class="panel-heading">@lang('preferences.title')</div>
<div class="panel-body">
<form class="form-horizontal" role="form">
@csrf