tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix garbled characters when cjk lang is selected.

Browse source
This commit is contained in:
Akira Matsuda 2016-03-02 20:38:51 +09:00
parent 2d5a30490e
commit 0b9b3cb7bc
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Providers/AppServiceProvider.php
View file

@ -19,8 +19,13 @@ class AppServiceProvider extends ServiceProvider {
public function boot()
{
HTML::macro('nav_link', function($url, $text, $url2 = '', $extra = '') {
$capitalize = config('former.capitalize_translations');
$class = ( Request::is($url) || Request::is($url.'/*') || Request::is($url2.'/*') ) ? ' class="active"' : '';
$title = ucwords(trans("texts.$text")) . Utils::getProLabel($text);
if($capitalize){
$title = ucwords(trans("texts.$text")) . Utils::getProLabel($text);
} else {
$title = trans("texts.$text") . Utils::getProLabel($text);
}
return '<li'.$class.'><a href="'.URL::to($url).'" '.$extra.'>'.$title.'</a></li>';
});

2
config/former.php
View file

@ -49,7 +49,7 @@
// Whether text that comes out of the translated
// should be capitalized (ex: email => Email) automatically
'capitalize_translations' => true,
'capitalize_translations' => false,
// An array of attributes to automatically translate
'translatable' => array(