diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-04-08 23:19:50 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-04-08 23:19:50 +0200 |
| commit | 744a9e8cf00aef7dec0acfa5f90f0dcfa2ef8837 (patch) | |
| tree | ffa4b7671c71c837a1f8f6f47de9ae07ce738d80 /app | |
| parent | d008b6c1a7488b99e77287ba14f1fff3ec1a116b (diff) | |
| parent | da53cc902c5e0ac2a05e92ad6b7780b6354d0438 (diff) | |
Merge pull request #2368 from FreshRSS/dev1.14.2
FreshRSS 1.14.2
Diffstat (limited to 'app')
| -rwxr-xr-x | app/Controllers/configureController.php | 3 | ||||
| -rw-r--r-- | app/i18n/oc/conf.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php index 16dd82121..6d3c4dcce 100755 --- a/app/Controllers/configureController.php +++ b/app/Controllers/configureController.php @@ -166,7 +166,8 @@ class FreshRSS_configure_Controller extends Minz_ActionController { * tab and up. */ public function shortcutAction() { - $this->view->list_keys = SHORTCUT_KEYS; + global $SHORTCUT_KEYS; + $this->view->list_keys = $SHORTCUT_KEYS; if (Minz_Request::isPost()) { FreshRSS_Context::$user_conf->shortcuts = validateShortcutList(Minz_Request::param('shortcuts')); diff --git a/app/i18n/oc/conf.php b/app/i18n/oc/conf.php index 3ac573ca7..1596950ea 100644 --- a/app/i18n/oc/conf.php +++ b/app/i18n/oc/conf.php @@ -92,7 +92,7 @@ return array( 'auto_remove_article' => 'Rescondre los articles aprèp lectura', 'confirm_enabled' => 'Mostrar una confirmacion per las accions del tipe « o marcar tot coma legit »', 'display_articles_unfolded' => 'Mostrar los articles desplegats per defaut', - 'display_categories_unfolded' => 'Mostrar las categorias desplegats per defaut', + 'display_categories_unfolded' => 'Mostrar las categorias desplegadas per defaut', 'hide_read_feeds' => 'Rescondre las categorias & fluxes sens articles pas legits (fonciona pas amb la configuracion « Mostrar totes los articles »)', 'img_with_lazyload' => 'Utilizar lo mòde “cargament tardiu” pels imatges', 'jump_next' => 'sautar al vesin venent pas legit (flux o categoria)', |