DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #14736 from snipe/fixes/small_translation_additions

Browse source 
Fixes/small translation additions
This commit is contained in:
snipe 2024-05-20 11:21:47 +01:00 committed by GitHub
parent e5c358a1fe 6a6272ace3
commit a820f248c8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/ProfileController.php
View file

@ -72,7 +72,7 @@ class ProfileController extends Controller
if ($user->save()) { if ($user->save()) {
return redirect()->route('profile')->with('success', 'Account successfully updated'); return redirect()->route('profile')->with('success', trans('account.general.profile_updated'));
} }
return redirect()->back()->withInput()->withErrors($user->getErrors()); return redirect()->back()->withInput()->withErrors($user->getErrors());

1
resources/lang/en-US/account/general.php
View file

@ -9,4 +9,5 @@ return array(
'api_token_expiration_time' => 'API tokens are set to expire in:', 'api_token_expiration_time' => 'API tokens are set to expire in:',
'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to 'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to
find specific API endpoints and additional API documentation.', find specific API endpoints and additional API documentation.',
'profile_updated' => 'Account successfully updated',
); );

1
resources/lang/en-US/table.php
View file

@ -6,5 +6,6 @@ return array(
'action' => 'Action', 'action' => 'Action',
'by' => 'By', 'by' => 'By',
'item' => 'Item', 'item' => 'Item',
'no_matching_records' => 'No matching records found',
); );

3
resources/views/partials/bootstrap-table.blade.php
View file

@ -92,6 +92,9 @@
exportTypes: ['xlsx', 'excel', 'csv', 'pdf','json', 'xml', 'txt', 'sql', 'doc' ], exportTypes: ['xlsx', 'excel', 'csv', 'pdf','json', 'xml', 'txt', 'sql', 'doc' ],
onLoadSuccess: function () { onLoadSuccess: function () {
$('[data-tooltip="true"]').tooltip(); // Needed to attach tooltips after ajax call $('[data-tooltip="true"]').tooltip(); // Needed to attach tooltips after ajax call
},
formatNoMatches: function () {
return '{{ trans('table.no_matching_records') }}';
} }
}); });