Skip to content

Commit

Permalink
setting => preference
Browse files Browse the repository at this point in the history
  • Loading branch information
@fisharebest
fisharebest committed Jun 11, 2016
1 parent d1c40ee commit 72292b7
Show file tree
Hide file tree
Showing 66 changed files with 801 additions and 341 deletions.
8 changes: 4 additions & 4 deletions admin_site_config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
<p class="small text-muted">
<?php echo /* I18N: %s is an amount of memory, such as 32MB */ I18N::translate('By default, your server allows scripts to use %s of memory.', get_cfg_var('memory_limit')) ?>
<?php echo I18N::translate('You can request a higher or lower limit, although the server may ignore this request.') ?>
<?php echo I18N::translate('If you leave this setting empty, the default value will be used.') ?>
<?php echo I18N::translate('Leave this blank to use the default value.') ?>
</p>
</div>
</div>
Expand All @@ -219,7 +219,7 @@
get_cfg_var('max_execution_time'), I18N::number(get_cfg_var('max_execution_time')));
?>
<?php echo I18N::translate('You can request a higher or lower limit, although the server may ignore this request.') ?>
<?php echo I18N::translate('If you leave this setting empty, the default value will be used.') ?>
<?php echo I18N::translate('Leave this blank to use the default value.') ?>
</p>
</div>
</div>
Expand Down Expand Up @@ -288,7 +288,7 @@
<input type="text" class="form-control" id="SESSION_TIME" name="SESSION_TIME" value="<?php echo Filter::escapeHtml(Site::getPreference('SESSION_TIME')) ?>" pattern="[0-9]*" placeholder="7200" maxlength="255">
<p class="small text-muted">
<?php echo /* I18N: Help text for the “Session timeout” site configuration setting */ I18N::translate('The time in seconds that a webtrees session remains active before requiring a new sign-in. The default is 7200, which is 2 hours.') ?>
<?php echo I18N::translate('If you leave this setting empty, the default value will be used.') ?>
<?php echo I18N::translate('Leave this blank to use the default value.') ?>
</p>
</div>
</div>
Expand All @@ -302,7 +302,7 @@
<?php echo FunctionsEdit::selectEditControl('SERVER_URL', array(WT_BASE_URL => WT_BASE_URL), '', Site::getPreference('SERVER_URL'), 'class="form-control"') ?>
<p class="small text-muted">
<?php echo /* I18N: Help text for the "Website URL" site configuration setting */ I18N::translate('If your website can be reached using more than one URL, such as <b>http://www.example.com/webtrees/</b> and <b>http://webtrees.example.com/</b>, you can specify the preferred URL. Requests for the other URLs will be redirected to the preferred one.') ?>
<?php echo I18N::translate('If you leave this setting empty, the default value will be used.') ?>
<?php echo I18N::translate('Leave this blank to use the default value.') ?>
</p>
</div>
</div>
Expand Down
58 changes: 30 additions & 28 deletions admin_trees_config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,10 @@ class="form-control"
</p>
</div>
</div>
<h2><?php echo I18N::translate('Privacy restrictions - these apply to records and facts that do not contain a GEDCOM RESN tag'); ?></h2>
<h2><?php echo /* I18N: Privacy restrictions are set by RESN tags in GEDCOM. */ I18N::translate('Privacy restrictions'); ?></h2>
<p>
<?php echo /* I18N: Privacy restrictions are RESN tags in GEDCOM. */ I18N::translate('You can set the access for a specific record, fact, or event by adding a restriction to it. If a record, fact, or event does not have a restriction, the following default restrictions will be used.') ?>
</p>

<script id="new-resn-template" type="text/html">
<tr>
Expand Down Expand Up @@ -644,7 +647,7 @@ class="form-control"
<?php endforeach; ?>
</select>
<p class="small text-muted">
<?php echo /* I18N: Help text for the “Language” configuration setting */ I18N::translate('If a visitor to the website has not specified a preferred language in their browser configuration, or they have specified an unsupported language, then this language will be used. Typically, this setting applies to search engines.'); ?>
<?php echo /* I18N: Help text for the “Language” configuration setting */ I18N::translate('If a visitor to the website has not selected a preferred language in their browser preferences, or they have selected an unsupported language, then this language will be used. Typically this applies to search engines.'); ?>
</p>
</div>
</div>
Expand Down Expand Up @@ -924,7 +927,7 @@ class="form-control"
</div>
</div>

<h3><?php echo I18N::translate('Website and META tag settings'); ?></h3>
<h3><?php echo I18N::translate('Website'); ?></h3>

<!-- META_TITLE -->
<div class="form-group">
Expand Down Expand Up @@ -993,7 +996,6 @@ class="form-control"
</div>
</div>

<h3><?php echo I18N::translate('Media'); ?></h3>
<h3><?php echo I18N::translate('Media folders'); ?></h3>

<!-- MEDIA_DIRECTORY -->
Expand Down Expand Up @@ -1075,7 +1077,7 @@ class="form-control"
</span>
</div>
<p class="small text-muted">
<?php echo /* I18N: Help text for the “Width of generated thumbnails” configuration setting */ I18N::translate('This is the width (in pixels) that the program will use when automatically generating thumbnails. The default setting is 100.'); ?>
<?php echo /* I18N: Help text for the “Width of generated thumbnails” configuration setting */ I18N::translate('This is the width (in pixels) that the program will use when automatically generating thumbnails. The default value is 100.'); ?>
</p>
</div>
</div>
Expand Down Expand Up @@ -1300,7 +1302,7 @@ class="form-control"
<div class="col-sm-9">
<?php echo FunctionsEdit::radioButtons('PEDIGREE_FULL_DETAILS', $no_yes, $WT_TREE->getPreference('PEDIGREE_FULL_DETAILS'), 'class="radio-inline"'); ?>
<p class="small text-muted">
<?php echo /* I18N: Help text for the “Show chart details by default” configuration setting */ I18N::translate('This is the initial setting for the “show details” option on the charts.'); ?>
<?php echo /* I18N: Help text for the “Show chart details by default” configuration setting */ I18N::translate('This is the initial value for the “show details” option on the charts.'); ?>
</p>
</div>
</fieldset>
Expand Down Expand Up @@ -1584,7 +1586,28 @@ class="form-control"
</div>
</fieldset>

<h3><?php echo GedcomTag::getLabel('TEXT'); ?></h3>
<!-- GEONAMES_ACCOUNT -->
<div class="form-group">
<label class="control-label col-sm-3" for="GEONAMES_ACCOUNT">
<?php echo I18N::translate('Use the GeoNames database for autocomplete on places'); ?>
</label>
<div class="col-sm-9">
<input
class="form-control"
dir="ltr"
id="GEONAMES_ACCOUNT"
maxlength="255"
name="GEONAMES_ACCOUNT"
type="text"
value="<?php echo Filter::escapeHtml($WT_TREE->getPreference('GEONAMES_ACCOUNT')); ?>"
>
<p class="small text-muted">
<?php echo /* I18N: Help text for the “Use GeoNames database for autocomplete on places” configuration setting */ I18N::translate('The website www.geonames.org provides a large database of place names. This can be searched when entering new places. To use this feature, you must register for a free account at www.geonames.org and provide the username.'); ?>
</p>
</div>
</div>

<h3><?php echo GedcomTag::getLabel('TEXT'); ?></h3>

<!-- FORMAT_TEXT -->
<fieldset class="form-group">
Expand Down Expand Up @@ -2160,27 +2183,6 @@ class="form-control"
</div>
</fieldset>

<!-- GEONAMES_ACCOUNT -->
<div class="form-group">
<label class="control-label col-sm-3" for="GEONAMES_ACCOUNT">
<?php echo I18N::translate('Use the GeoNames database for autocomplete on places'); ?>
</label>
<div class="col-sm-9">
<input
class="form-control"
dir="ltr"
id="GEONAMES_ACCOUNT"
maxlength="255"
name="GEONAMES_ACCOUNT"
type="text"
value="<?php echo Filter::escapeHtml($WT_TREE->getPreference('GEONAMES_ACCOUNT')); ?>"
>
<p class="small text-muted">
<?php echo /* I18N: Help text for the “Use GeoNames database for autocomplete on places” configuration setting */ I18N::translate('The website www.geonames.org provides a large database of place names. This can be searched when entering new places. To use this feature, you must register for a free account at www.geonames.org and provide the username.'); ?>
</p>
</div>
</div>

<!-- NO_UPDATE_CHAN -->
<fieldset class="form-group">
<legend class="control-label col-sm-3">
Expand Down
2 changes: 1 addition & 1 deletion app/Site.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public static function setPreference($setting_name, $setting_value) {

self::$settings[$setting_name] = $setting_value;

Log::addConfigurationLog('Site setting "' . $setting_name . '" set to "' . $setting_value . '"');
Log::addConfigurationLog('Site preference "' . $setting_name . '" set to "' . $setting_value . '"');
}
}
}
4 changes: 2 additions & 2 deletions app/Tree.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ public function setPreference($setting_name, $setting_value) {
// Update our cache
$this->preferences[$setting_name] = $setting_value;
// Audit log of changes
Log::addConfigurationLog('Tree setting "' . $setting_name . '" set to "' . $setting_value . '"', $this);
Log::addConfigurationLog('Tree preference "' . $setting_name . '" set to "' . $setting_value . '"', $this);
}

return $this;
Expand Down Expand Up @@ -290,7 +290,7 @@ public function setUserPreference(User $user, $setting_name, $setting_value) {
// Update our cache
$this->user_preferences[$user->getUserId()][$setting_name] = $setting_value;
// Audit log of changes
Log::addConfigurationLog('Tree setting "' . $setting_name . '" set to "' . $setting_value . '" for user "' . $user->getUserName() . '"', $this);
Log::addConfigurationLog('Tree preference "' . $setting_name . '" set to "' . $setting_value . '" for user "' . $user->getUserName() . '"', $this);
}

return $this;
Expand Down
19 changes: 14 additions & 5 deletions language/af.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7385,8 +7385,9 @@ msgstr "Identifikasienommer"

#. I18N: Help text for the “Language” configuration setting
#: admin_trees_config.php:650
msgid "If a visitor to the website has not specified a preferred language in their browser configuration, or they have specified an unsupported language, then this language will be used. Typically, this setting applies to search engines."
msgid "If a visitor to the website has not selected a preferred language in their browser preferences, or they have selected an unsupported language, then this language will be used. Typically this applies to search engines."
msgstr "Wanneer 'n besoeker van die werf geen voorkeurtaal in sy/haar webblaaier-konfigurasie ingestel het nie, of 'n nie ondersteunde taal ingestel het, dan sal hieride taal gebruik word. Tipies sal hierdie instelling op soekenjins van toepassing wees."
#, fuzzy

#: admin_users.php:392
msgid "If an administrator creates a user account, the verification email is not sent, and the email must be verified manually."
Expand Down Expand Up @@ -7475,8 +7476,9 @@ msgstr "As jy 'n leë blok verberg, sal jy nie die blok se opstelling kan verand

#: admin_site_config.php:203 admin_site_config.php:222
#: admin_site_config.php:291 admin_site_config.php:305
msgid "If you leave this setting empty, the default value will be used."
msgid "Leave this blank to use the default value."
msgstr "As hierdie instelling leeg gehou word, sal die verstekwaarde gebruik word."
#, fuzzy

#: admin_site_config.php:185
msgid "If you select a different folder, you must also move all files (except config.ini.php, index.php, and .htaccess) from the existing folder to the new folder."
Expand Down Expand Up @@ -11185,6 +11187,10 @@ msgstr "Privaatheid"
msgid "Privacy restrictions - these apply to records and facts that do not contain a GEDCOM RESN tag"
msgstr "Privaatheidsbeperkinge - hierdie is van toepassing op rekords en feite sonder 'n GEDCOM RESN etiket"

msgid "Privacy restrictions"
msgstr "Privaatheidsbeperkinge"
#, fuzzy

#: app/Controller/GedcomRecordController.php:92 app/GedcomRecord.php:532
#: app/GedcomRecord.php:610 app/GedcomRecord.php:735 app/Individual.php:1309
#: app/Module/GoogleMapsModule.php:822 app/Note.php:71
Expand Down Expand Up @@ -14413,8 +14419,9 @@ msgstr "Dit is hooflettergevoelig. As 'n databasis met hierdie naam nog nie best

#. I18N: Help text for the “Show chart details by default” configuration setting
#: admin_trees_config.php:1371
msgid "This is the initial setting for the “show details” option on the charts."
msgid "This is the initial value for the “show details” option on the charts."
msgstr "Dit is die aanvanklike instelling vir die “vertoon besonderhede” opsie in diagramme."
#, fuzzy

#: admin.php:615 admin_site_upgrade.php:67
msgid "This is the latest version of webtrees. No upgrade is available."
Expand Down Expand Up @@ -14492,8 +14499,9 @@ msgstr "Dit is die verkorte lys van GEDCOM-feite vir bronne wat langsaan die vol

#. I18N: Help text for the “Width of generated thumbnails” configuration setting
#: admin_trees_config.php:1081
msgid "This is the width (in pixels) that the program will use when automatically generating thumbnails. The default setting is 100."
msgid "This is the width (in pixels) that the program will use when automatically generating thumbnails. The default value is 100."
msgstr "Dit is die breedte (in pixels) wat die program sal gebruik wanneer miniature outomaties geskep word. Die verstekwaarde is 100."
#, fuzzy

#: admin_users.php:318 edituser.php:176 login.php:420 setup.php:428
msgid "This is your real name, as you would like it displayed on screen."
Expand Down Expand Up @@ -15306,8 +15314,9 @@ msgid "Ukraine"
msgstr "Oekraïne"

#: setup.php:264 setup.php:336
msgid "Unable to connect using these settings. Your server gave the following error."
msgid "Unable to connect using this username and password. Your server gave the following error."
msgstr "Kon nie met hierdie instellings 'n verbinding maak nie. Jou bediener het die volgende foutboodskap verskaf."
#, fuzzy

#: admin_trees_config.php:678
msgid "Unable to find record with ID"
Expand Down
19 changes: 14 additions & 5 deletions language/ar.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7497,8 +7497,9 @@ msgstr "رقم تعريف"

#. I18N: Help text for the “Language” configuration setting
#: admin_trees_config.php:650
msgid "If a visitor to the website has not specified a preferred language in their browser configuration, or they have specified an unsupported language, then this language will be used. Typically, this setting applies to search engines."
msgid "If a visitor to the website has not selected a preferred language in their browser preferences, or they have selected an unsupported language, then this language will be used. Typically this applies to search engines."
msgstr "عند زيارة الموقع دون تحديد لغة مفضلة في متصفح الإنترنت للزائر، أو كانت اللغة المحددة غير مدعومة سيتم إستخدام اللغة المختارة هنا. عادة هذا الإعداد ينطبق على محركات البحث."
#, fuzzy

#: admin_users.php:392
msgid "If an administrator creates a user account, the verification email is not sent, and the email must be verified manually."
Expand Down Expand Up @@ -7587,8 +7588,9 @@ msgstr "عند إخفاء الكتل الفارغة، لن يتم التمكن

#: admin_site_config.php:203 admin_site_config.php:222
#: admin_site_config.php:291 admin_site_config.php:305
msgid "If you leave this setting empty, the default value will be used."
msgid "Leave this blank to use the default value."
msgstr "عند ترك هذا فارغاً، سيتم إستخدام القيمة الإفتراضية."
#, fuzzy

#: admin_site_config.php:185
msgid "If you select a different folder, you must also move all files (except config.ini.php, index.php, and .htaccess) from the existing folder to the new folder."
Expand Down Expand Up @@ -11302,6 +11304,10 @@ msgstr "الخصوصية"
msgid "Privacy restrictions - these apply to records and facts that do not contain a GEDCOM RESN tag"
msgstr "تطبيقات الخصوصية للسجلات التي لا تحتوي على علامة خصوصية GEDCOM"

msgid "Privacy restrictions"
msgstr "تطبيقات الخصوصية"
#, fuzzy

#: app/Controller/GedcomRecordController.php:92 app/GedcomRecord.php:532
#: app/GedcomRecord.php:610 app/GedcomRecord.php:735 app/Individual.php:1309
#: app/Module/GoogleMapsModule.php:822 app/Note.php:71
Expand Down Expand Up @@ -14560,8 +14566,9 @@ msgstr "حالة الأحرف معتبرة هنا. إذا لم توجد قاعد

#. I18N: Help text for the “Show chart details by default” configuration setting
#: admin_trees_config.php:1371
msgid "This is the initial setting for the “show details” option on the charts."
msgid "This is the initial value for the “show details” option on the charts."
msgstr ""
#, fuzzy

#: admin.php:615 admin_site_upgrade.php:67
msgid "This is the latest version of webtrees. No upgrade is available."
Expand Down Expand Up @@ -14639,8 +14646,9 @@ msgstr "هذه قائمة مختصرة لقائمة معلومات المصدر

#. I18N: Help text for the “Width of generated thumbnails” configuration setting
#: admin_trees_config.php:1081
msgid "This is the width (in pixels) that the program will use when automatically generating thumbnails. The default setting is 100."
msgid "This is the width (in pixels) that the program will use when automatically generating thumbnails. The default value is 100."
msgstr "مقاس عرض الصور المصغرة التي يتم إنشاءها تلقائياً بالنقاط. المقاس الإفتراضي هو 100 نقطة."
#, fuzzy

#: admin_users.php:318 edituser.php:176 login.php:420 setup.php:428
msgid "This is your real name, as you would like it displayed on screen."
Expand Down Expand Up @@ -15464,8 +15472,9 @@ msgid "Ukraine"
msgstr "أوكرانيا"

#: setup.php:264 setup.php:336
msgid "Unable to connect using these settings. Your server gave the following error."
msgid "Unable to connect using this username and password. Your server gave the following error."
msgstr "لم يتم التمكن من الإتصال بهذه الإعدادات. خادمك أعطى هذا الخطأ."
#, fuzzy

#: admin_trees_config.php:678
msgid "Unable to find record with ID"
Expand Down
Loading

0 comments on commit 72292b7

Please sign in to comment.