From 72292b7d4ece79fa8793e7954550021f2f4c5a15 Mon Sep 17 00:00:00 2001 From: Greg Roach Date: Sat, 11 Jun 2016 17:34:50 +0100 Subject: setting => preference --- admin_site_config.php | 8 +++---- admin_trees_config.php | 58 ++++++++++++++++++++++++++------------------------ app/Site.php | 2 +- app/Tree.php | 4 ++-- language/af.po | 19 ++++++++++++----- language/ar.po | 19 ++++++++++++----- language/bg.po | 19 ++++++++++++----- language/bs.po | 15 ++++++++----- language/ca.po | 19 ++++++++++++----- language/cs.po | 16 ++++++++++---- language/da.po | 19 ++++++++++++----- language/de.po | 19 ++++++++++++----- language/dv.po | 15 ++++++++----- language/el.po | 19 ++++++++++++----- language/en-AU.po | 18 +++++++++++----- language/en-GB.po | 18 +++++++++++----- language/en-US.po | 15 ++++++++----- language/es.po | 19 ++++++++++++----- language/et.po | 19 ++++++++++++----- language/fa.po | 19 ++++++++++++----- language/fi.po | 19 ++++++++++++----- language/fo.po | 15 ++++++++----- language/fr-CA.po | 19 ++++++++++++----- language/fr.po | 19 ++++++++++++----- language/gl.po | 19 ++++++++++++----- language/he.po | 19 ++++++++++++----- language/hr.po | 19 ++++++++++++----- language/hu.po | 19 ++++++++++++----- language/id.po | 15 ++++++++----- language/is.po | 19 ++++++++++++----- language/it.po | 19 ++++++++++++----- language/ja.po | 15 ++++++++----- language/ka.po | 15 ++++++++----- language/ko.po | 15 ++++++++----- language/ln.po | 15 ++++++++----- language/lt.po | 19 ++++++++++++----- language/lv.po | 15 ++++++++----- language/mi.po | 15 ++++++++----- language/mr.po | 19 ++++++++++++----- language/ms.po | 15 ++++++++----- language/nb.po | 19 ++++++++++++----- language/ne.po | 15 ++++++++----- language/nl.po | 19 ++++++++++++----- language/nn.po | 19 ++++++++++++----- language/oc.po | 19 ++++++++++++----- language/pl.po | 19 ++++++++++++----- language/pt-BR.po | 19 ++++++++++++----- language/pt.po | 19 ++++++++++++----- language/ro.po | 15 ++++++++----- language/ru.po | 19 ++++++++++++----- language/sk.po | 19 ++++++++++++----- language/sl.po | 15 ++++++++----- language/sq.po | 19 ++++++++++++----- language/sr-Latn.po | 15 ++++++++----- language/sr.po | 15 ++++++++----- language/sv.po | 19 ++++++++++++----- language/sw.po | 15 ++++++++----- language/ta.po | 15 ++++++++----- language/tr.po | 19 ++++++++++++----- language/tt.po | 15 ++++++++----- language/uk.po | 19 ++++++++++++----- language/vi.po | 19 ++++++++++++----- language/yi.po | 15 ++++++++----- language/zh-Hans.po | 19 ++++++++++++----- language/zh-Hant.po | 15 ++++++++----- setup.php | 4 ++-- 66 files changed, 801 insertions(+), 341 deletions(-) diff --git a/admin_site_config.php b/admin_site_config.php index dd494d4fc6..b83334bcb8 100644 --- a/admin_site_config.php +++ b/admin_site_config.php @@ -200,7 +200,7 @@ $controller->pageHeader();

- +

@@ -219,7 +219,7 @@ $controller->pageHeader(); get_cfg_var('max_execution_time'), I18N::number(get_cfg_var('max_execution_time'))); ?> - +

@@ -288,7 +288,7 @@ $controller->pageHeader();

- +

@@ -302,7 +302,7 @@ $controller->pageHeader(); WT_BASE_URL), '', Site::getPreference('SERVER_URL'), 'class="form-control"') ?>

http://www.example.com/webtrees/ and http://webtrees.example.com/, you can specify the preferred URL. Requests for the other URLs will be redirected to the preferred one.') ?> - +

diff --git a/admin_trees_config.php b/admin_trees_config.php index a433d40ac0..db0d1b953f 100644 --- a/admin_trees_config.php +++ b/admin_trees_config.php @@ -499,7 +499,10 @@ $controller

-

+

+

+ +