cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update ver1.0.5.4

Browse Source
This commit is contained in:
Manish Verma
2016-02-01 18:08:35 +05:30
parent 6cce175cf4
commit b0e8fadb58
4 changed files with 311 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/Http/Controllers/Admin/helpdesk/LanguageController.php
View File

@@ -48,8 +48,8 @@ class LanguageController extends Controller {
// return Cache::get('language'); // return Cache::get('language');
//} else return 'false'; //} else return 'false';
// Cache::put('language',$) // Cache::put('language',$)
$path = '../resources/lang';// Path to check available language packages
if(array_key_exists($lang, Config::get('languages'))) { if(array_key_exists($lang, Config::get('languages')) && in_array($lang, scandir($path))) {
// dd(array_key_exists($lang, Config::get('languages'))); // dd(array_key_exists($lang, Config::get('languages')));
// app()->setLocale($lang); // app()->setLocale($lang);
@@ -57,7 +57,7 @@ class LanguageController extends Controller {
// dd(Cache::get('language')); // dd(Cache::get('language'));
// dd() // dd()
} else { } else {
return Redirect::back()->with('message', 'Language package not found in your lang directroy.'); return Redirect::back()->with('fails', Lang::get("lang.language-error"));
} }
return Redirect::back(); return Redirect::back();
} }
@@ -151,17 +151,17 @@ class LanguageController extends Controller {
//Checking if package already exists or not in lang folder //Checking if package already exists or not in lang folder
$path = '../resources/lang'; $path = '../resources/lang';
if (in_array(Input::get('iso-code'), scandir($path))) { if (in_array(strtolower(Input::get('iso-code')), scandir($path))) {
//sending back with error message //sending back with error message
Session::flash('fails', "Language package already exists."); Session::flash('fails', Lang::get('lang.package_exist'));
Session::flash('link',"change-language/".Input::get('iso-code')); Session::flash('link',"change-language/".strtolower(Input::get('iso-code')));
return Redirect::back()->withInput(); return Redirect::back()->withInput();
} elseif (!array_key_exists(Input::get('iso-code'), Config::get('languages'))){//Checking Valid ISO code form Languages.php } elseif (!array_key_exists(strtolower(Input::get('iso-code')), Config::get('languages'))){//Checking Valid ISO code form Languages.php
//sending back with error message //sending back with error message
Session::flash('fails', "Enter correct ISO-code"); Session::flash('fails', Lang::get('lang.iso-code-error'));
return Redirect::back()->withInput(); return Redirect::back()->withInput();
} else { } else {
@@ -170,7 +170,7 @@ class LanguageController extends Controller {
if (Input::file('File')->isValid()) { if (Input::file('File')->isValid()) {
$name = Input::file('File')->getClientOriginalName(); //uploaded file's original name $name = Input::file('File')->getClientOriginalName(); //uploaded file's original name
$destinationPath = '../public/uploads/'; // defining uploading path $destinationPath = '../public/uploads/'; // defining uploading path
$extractpath = '../resources/lang/'.Input::get('iso-code');//defining extracting path $extractpath = '../resources/lang/'.strtolower(Input::get('iso-code'));//defining extracting path
mkdir($extractpath); //creating directroy for extracting uploadd file mkdir($extractpath); //creating directroy for extracting uploadd file
//mkdir($destinationPath); //mkdir($destinationPath);
Input::file('File')->move($destinationPath, $name); // uploading file to given path Input::file('File')->move($destinationPath, $name); // uploading file to given path
@@ -184,18 +184,19 @@ class LanguageController extends Controller {
//$success2 = File::delete($destinationPath.'/'.$name); //$success2 = File::delete($destinationPath.'/'.$name);
if($success){ if($success){
//sending back with error message //sending back with error message
Session::flash('fails', 'Error in directory structure. Zip file must contain language php files only. Try Again.'); Session::flash('fails', Lang::get('lang.zipp-error'));
Session::flash('link2',"http://www.ladybirdweb.com/support/show/how-to-translate-faveo-into-multiple-languages");
return Redirect::back()->withInput(); return Redirect::back()->withInput();
} }
} else { } else {
// sending back with success message // sending back with success message
Session::flash('success', "uploaded successfully."); Session::flash('success', Lang::get("lang.upload-success"));
Session::flash('link',"change-language/".Input::get('iso-code')); Session::flash('link',"change-language/".strtolower(Input::get('iso-code')));
return Redirect::route('LanguageController'); return Redirect::route('LanguageController');
} }
} else { } else {
// sending back with error message. // sending back with error message.
Session::flash('fails', 'uploaded file is not valid'); Session::flash('fails', Lang::get("lang.file-error"));
return Redirect::route('form'); return Redirect::route('form');
} }
} }
@@ -221,16 +222,16 @@ class LanguageController extends Controller {
$success = File::deleteDirectory($deletePath); //remove extracted folder and it's subfolder from lang $success = File::deleteDirectory($deletePath); //remove extracted folder and it's subfolder from lang
if($success) { if($success) {
//sending back with success message //sending back with success message
Session::flash('success', 'Language package deleted successfully.'); Session::flash('success', Lang::get('lang.delete-success'));
return Redirect::back(); return Redirect::back();
} else { } else {
//sending back with error message //sending back with error message
Session::flash('fails', 'Language package does not exist.'); Session::flash('fails', Lang::get('lang.lang-doesnot-exist'));
return Redirect::back(); return Redirect::back();
} }
} else { } else {
//sending back with error message //sending back with error message
Session::flash('fails', 'Language package can not be deleted when it is active.'); Session::flash('fails', Lang::get('lang.active-lang-error'));
return redirect('languages'); return redirect('languages');
} }
} }

13
resources/lang/en/lang.php
View File

@@ -322,7 +322,18 @@ return array(
'english' => 'English', 'english' => 'English',
'language-name' => 'Language name', 'language-name' => 'Language name',
'file' => 'File', 'file' => 'File',
'read-more' => 'Read more.',
'enable_lang' => 'Enable it.',
'add-lang-package' => 'Add new language package',
'package_exist' => "Package already exists.",
'iso-code-error' => "Error in iso-code. enter correct iso-code.",
'zipp-error' => 'Error in zip file. Zip must contian language php files only.',
'upload-success' => "Uploaded successfully.",
"file-error" => 'Error in file or invalid file.',
'delete-success' => 'Language package deleted successfully.',
'lang-doesnot-exist' => 'Language package does not exist.',
'active-lang-error' => 'Language package can not be deleted when it is active.',
"language-error" => 'Language package not found in your lang directroy.',
/* /*
|---------------------------------------------------------------------------------------- |----------------------------------------------------------------------------------------

9
resources/views/themes/default1/admin/helpdesk/language/create.blade.php
View File

@@ -38,7 +38,7 @@ class="active"
<div class="box box-primary"> <div class="box box-primary">
<div class="content-header"> <div class="content-header">
<h4>Add language package {!! Form::submit(Lang::get('lang.save'),['class'=>'form-group btn btn-primary pull-right'])!!}</h4> <h4>{{Lang::get('lang.add-lang-package')}} {!! Form::submit(Lang::get('lang.save'),['class'=>'form-group btn btn-primary pull-right'])!!}</h4>
</div> </div>
@@ -57,7 +57,10 @@ class="active"
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
{{Session::get('fails')}} {{Session::get('fails')}}
@if(Session::has('link')) @if(Session::has('link'))
<a href="{{url(Session::get('link'))}}"> Enable it</a> <a href="{{url(Session::get('link'))}}">{{Lang::get('lang.enable_lang')}}</a>
@endif
@if(Session::has('link2'))
<a href="{{url(Session::get('link2'))}}" target="blank">{{Lang::get('lang.read-more')}}</a>
@endif @endif
</div> </div>
@endif @endif
@@ -83,7 +86,7 @@ class="active"
<div class="row"> <div class="row">
<div class="col-xs-4 form-group {{ $errors->has('File') ? 'has-error' : '' }}"> <div class="col-xs-4 form-group {{ $errors->has('File') ? 'has-error' : '' }}">
{!! Form::label('File',Lang::get('lang.file')) !!} {!! Form::label('File',Lang::get('lang.file')) !!}&nbsp
<div class="btn bg-olive btn-file" style="color:blue"> {!! Lang::get('lang.upload_file') !!} <div class="btn bg-olive btn-file" style="color:blue"> {!! Lang::get('lang.upload_file') !!}
{!! Form::file('File') !!} {!! Form::file('File') !!}
</div> </div>

2
resources/views/themes/default1/admin/helpdesk/language/index.blade.php
View File

@@ -41,7 +41,7 @@ class="active"
<div class="alert alert-success alert-dismissable"> <div class="alert alert-success alert-dismissable">
<i class="fa fa-check-circle"></i> <i class="fa fa-check-circle"></i>
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
{{Session::get('success')}} <a href="{{url(Session::get('link'))}}"> Enable it</a> {{Session::get('success')}} @if(Session::has('link'))<a href="{{url(Session::get('link'))}}">{{Lang::get('lang.enable_lang')}}</a> @endif
</div> </div>
@endif @endif
<!-- failure message --> <!-- failure message -->