zhangyuheng/blessing-skin-server
1
0
Fork 0
forked from mirror/blessing-skin-server
Code Pull Requests Activity

add support for using trans id in plugin title/description

Browse Source
This commit is contained in:
printempw 2017-01-02 10:39:50 +08:00
parent cc6afebfec
commit 2125e05bc2
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/PluginController.php
View File

@ -21,6 +21,10 @@ class PluginController extends Controller
if ($plugins->getPlugins()->has($id)) { if ($plugins->getPlugins()->has($id)) {
$plugin = $plugins->getPlugin($id); $plugin = $plugins->getPlugin($id);
// pass the plugin title through the translator
$plugin->title = trans($plugin->title);
switch ($request->get('action')) { switch ($request->get('action')) {
case 'enable': case 'enable':
$plugins->enable($id); $plugins->enable($id);

13
app/Providers/PluginServiceProvider.php
View File

@ -22,12 +22,15 @@ class PluginServiceProvider extends ServiceProvider
// make view instead of view.finder since the finder is defined as not a singleton // make view instead of view.finder since the finder is defined as not a singleton
$finder = $this->app->make('view'); $finder = $this->app->make('view');
foreach ($plugins->getEnabledPlugins() as $plugin) { foreach ($plugins->getPlugins() as $plugin) {
$src_paths[$plugin->getNameSpace()] = $plugin->getPath()."/src"; if ($plugin->isEnabled()) {
// add paths of translation files for namespace hints $src_paths[$plugin->getNameSpace()] = $plugin->getPath()."/src";
// add paths of views
$finder->addNamespace($plugin->getNameSpace(), $plugin->getPath()."/views");
}
// always add paths of translation files for namespace hints
$loader->addNamespace($plugin->getNameSpace(), $plugin->getPath()."/lang"); $loader->addNamespace($plugin->getNameSpace(), $plugin->getPath()."/lang");
// add paths of views
$finder->addNamespace($plugin->getNameSpace(), $plugin->getPath()."/views");
} }
$this->registerClassAutoloader($src_paths); $this->registerClassAutoloader($src_paths);

5
app/helpers.php
View File

@ -253,9 +253,10 @@ if (! function_exists('option')) {
* *
* @param array|string $key * @param array|string $key
* @param mixed $default * @param mixed $default
* @param raw $raw return raw value without convertion
* @return mixed * @return mixed
*/ */
function option($key = null, $default = null) function option($key = null, $default = null, $raw = false)
{ {
$options = app('options'); $options = app('options');
@ -270,7 +271,7 @@ if (! function_exists('option')) {
return; return;
} }
return $options->get($key, $default); return $options->get($key, $default, $raw);
} }
} }