AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support for language LDAP attribute

Browse Source
This commit is contained in:
Frederic Guillot
2016-05-07 18:05:33 -04:00
parent aac11a609c
commit 55ee906ba3
28 changed files with 400 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Controller/Config.php
View File

@@ -42,7 +42,7 @@ class Config extends Base
}
if ($this->config->save($values)) {
$this->config->reload();
$this->language->loadCurrentLanguage();
$this->flash->success(t('Settings saved successfully.'));
} else {
$this->flash->failure(t('Unable to save your settings.'));
@@ -90,8 +90,8 @@ class Config extends Base
$this->common('application');
$this->response->html($this->helper->layout->config('config/application', array(
'languages' => $this->config->getLanguages(),
'timezones' => $this->config->getTimezones(),
'languages' => $this->language->getLanguages(),
'timezones' => $this->timezone->getTimezones(),
'date_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateFormats()),
'datetime_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateTimeFormats()),
'time_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getTimeFormats()),

1
app/Controller/Currency.php
View File

@@ -59,7 +59,6 @@ class Currency extends Base
$values = $this->request->getValues();
if ($this->config->save($values)) {
$this->config->reload();
$this->flash->success(t('Settings saved successfully.'));
} else {
$this->flash->failure(t('Unable to save your settings.'));

4
app/Controller/Doc.php
View File

@@ -20,7 +20,7 @@ class Doc extends Base
$page = 'index';
}
if ($this->config->getCurrentLanguage() === 'fr_FR') {
if ($this->language->getCurrentLanguage() === 'fr_FR') {
$filename = __DIR__.'/../../doc/fr/' . $page . '.markdown';
} else {
$filename = __DIR__ . '/../../doc/' . $page . '.markdown';
@@ -83,7 +83,7 @@ class Doc extends Base
*/
public function replaceImageUrl(array $matches)
{
if ($this->config->getCurrentLanguage() === 'fr_FR') {
if ($this->language->getCurrentLanguage() === 'fr_FR') {
return '('.$this->helper->url->base().'doc/fr/'.$matches[1].')';
}

14
app/Controller/User.php
View File

@@ -67,8 +67,8 @@ class User extends Base
$is_remote = $this->request->getIntegerParam('remote') == 1 || (isset($values['is_ldap_user']) && $values['is_ldap_user'] == 1);
$this->response->html($this->helper->layout->app($is_remote ? 'user/create_remote' : 'user/create_local', array(
'timezones' => $this->config->getTimezones(true),
'languages' => $this->config->getLanguages(true),
'timezones' => $this->timezone->getTimezones(true),
'languages' => $this->language->getLanguages(true),
'roles' => $this->role->getApplicationRoles(),
'projects' => $this->project->getList(),
'errors' => $errors,
@@ -121,8 +121,8 @@ class User extends Base
$user = $this->getUser();
$this->response->html($this->helper->layout->user('user/show', array(
'user' => $user,
'timezones' => $this->config->getTimezones(true),
'languages' => $this->config->getLanguages(true),
'timezones' => $this->timezone->getTimezones(true),
'languages' => $this->language->getLanguages(true),
)));
}
@@ -247,7 +247,7 @@ class User extends Base
$this->response->html($this->helper->layout->user('user/integrations', array(
'user' => $user,
'values' => $this->userMetadata->getall($user['id']),
'values' => $this->userMetadata->getAll($user['id']),
)));
}
@@ -365,8 +365,8 @@ class User extends Base
'values' => $values,
'errors' => $errors,
'user' => $user,
'timezones' => $this->config->getTimezones(true),
'languages' => $this->config->getLanguages(true),
'timezones' => $this->timezone->getTimezones(true),
'languages' => $this->language->getLanguages(true),
'roles' => $this->role->getApplicationRoles(),
)));
}