Skip to content

Commit

Permalink
Applied fixes from StyleCI
Browse files Browse the repository at this point in the history
  • Loading branch information
jenky authored and StyleCIBot committed Feb 1, 2016
1 parent 9bff9e8 commit bff89f2
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
9 changes: 5 additions & 4 deletions resources/lang/en/ui.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php
return array(
'browse'=>'Browse',
'upload'=>'Upload',
);

return [
'browse' => 'Browse',
'upload' => 'Upload',
];
9 changes: 5 additions & 4 deletions resources/lang/zh-CN/ui.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php
return array(
'browse'=>'选择文件',
'upload'=>'上传',
);

return [
'browse' => '选择文件',
'upload' => '上传',
];
3 changes: 1 addition & 2 deletions src/PluploadServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,12 @@ protected function setupConfig()
$this->mergeConfigFrom($configPath, 'plupload');
$this->loadViewsFrom($viewsPath, 'plupload');


$this->publishes([$configPath => config_path('plupload.php')], 'config');
$this->publishes([
$viewsPath => base_path('resources/views/vendor/plupload'),
$assetsPath.'/js' => base_path('resources/assets/plupload'),
]);
$this->loadTranslationsFrom(__DIR__ . '/../resources/lang', 'plupload');
$this->loadTranslationsFrom(__DIR__.'/../resources/lang', 'plupload');
}

/**
Expand Down

0 comments on commit bff89f2

Please sign in to comment.