Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2026-05-05 14:36:22 +02:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/develop' into feature/es6_revamp

Browse Source 
# Conflicts:
#	languages/en.yaml
#	themes/grav/css-compiled/template.css
#	themes/grav/css-compiled/template.css.map
#	themes/grav/templates/forms/fields/tabs/tabs.html.twig
This commit is contained in:
Djamil Legato
2016-02-09 13:04:16 -08:00
parent fab26a31fc 5b3f64069d
commit 22055f8a19
43 changed files with 6323 additions and 4024 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
classes/admin.php
View File

@@ -184,8 +184,7 @@ class Admin
/** @var Grav $grav */
$grav = $this->grav;
$this->setMessage($this->translate('PLUGIN_ADMIN.LOGIN_LOGGED_IN', [$this->user->language]), 'info');
$this->setMessage($this->translate('PLUGIN_ADMIN.LOGIN_LOGGED_IN'), 'info');
$redirect_route = $this->uri->route();
$grav->redirect($redirect_route);
}
@@ -389,6 +388,8 @@ class Admin
/**
* Get all routes.
*
* @param bool $unique
*
* @return array
*/
public function routes($unique = false)
@@ -455,6 +456,8 @@ class Admin
/**
* Get all plugins.
*
* @param bool $local
*
* @return array
*/
public function plugins($local = true)
@@ -476,6 +479,8 @@ class Admin
/**
* Get all themes.
*
* @param bool $local
*
* @return array
*/
public function themes($local = true)
@@ -749,6 +754,7 @@ class Admin
$pages = Grav::instance()['pages'];
$route = '/' . ltrim(Grav::instance()['admin']->route, '/');
/** @var Page $page */
$page = $pages->dispatch($route);
$parent_route = null;
if ($page) {
@@ -829,22 +835,11 @@ class Admin
/**
* Translate a string to the user-defined language
*
* @param string $string the string to translate
* @return string
*/
public function translate($string)
{
return $this->_translate($string, [$this->grav['user']->authenticated ? $this->grav['user']->language : 'en']);
}
/**
* @param array|mixed $args
* @param array|null $languages
* @param bool $array_support
* @param bool $html_out
*
* @return string
*/
public function _translate($args, Array $languages = null, $array_support = false, $html_out = false)
public function translate($args)
{
if (is_array($args)) {
$lookup = array_shift($args);
@@ -853,6 +848,8 @@ class Admin
$args = [];
}
$languages = [$this->grav['user']->authenticated ? $this->grav['user']->language : 'en'];
if ($lookup) {
if (empty($languages) || reset($languages) == null) {
if ($this->grav['config']->get('system.languages.translations_fallback', true)) {
@@ -861,22 +858,19 @@ class Admin
$languages = (array)$this->grav['language']->getDefault();
}
}
} else {
$languages = ['en'];
}
foreach ((array)$languages as $lang) {
$translation = $this->grav['language']->getTranslation($lang, $lookup, $array_support);
$translation = $this->grav['language']->getTranslation($lang, $lookup);
if (!$translation) {
$language = $this->grav['language']->getDefault() ?: 'en';
$translation = $this->grav['language']->getTranslation($language, $lookup, $array_support);
$translation = $this->grav['language']->getTranslation($language, $lookup);
}
if (!$translation) {
$language = 'en';
$translation = $this->grav['language']->getTranslation($language, $lookup, $array_support);
$translation = $this->grav['language']->getTranslation($language, $lookup);
}
if ($translation) {