diff --git a/application/locale/de_DE/LC_MESSAGES/director.mo b/application/locale/de_DE/LC_MESSAGES/director.mo index b36336ff..9b76c864 100644 Binary files a/application/locale/de_DE/LC_MESSAGES/director.mo and b/application/locale/de_DE/LC_MESSAGES/director.mo differ diff --git a/application/locale/de_DE/LC_MESSAGES/director.po b/application/locale/de_DE/LC_MESSAGES/director.po index 51c2e376..b06e09ba 100644 --- a/application/locale/de_DE/LC_MESSAGES/director.po +++ b/application/locale/de_DE/LC_MESSAGES/director.po @@ -2,22 +2,22 @@ # Copyright (C) 2017 Icinga Development Team # This file is distributed under the same license as Director Module. # Thomas Widhalm , 2016. -# +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: Director Module (master)\n" "Report-Msgid-Bugs-To: dev@icinga.com\n" -"POT-Creation-Date: 2017-10-09 15:26+0200\n" -"PO-Revision-Date: 2017-10-09 15:42+0200\n" +"POT-Creation-Date: 2017-11-24 10:52+0100\n" +"PO-Revision-Date: 2017-11-24 10:49+0100\n" "Last-Translator: Thomas Gelf \n" "Language: de_DE\n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-Basepath: .\n" -"Language-Team: \n" -"X-Generator: Poedit 1.8.7.1\n" "X-Poedit-SearchPath-0: .\n" #: library/Director/Web/Form/DirectorObjectForm.php:588 @@ -3950,6 +3950,11 @@ msgstr "Für die Selbstbedienungs-API freigeben" msgid "Shared for Self Service API" msgstr "Für die Selbstbedienungs-API freigegeben" +#: library/Director/PropertyModifier/PropertyModifierUpperCaseFirst.php:21 +msgid "Should all the other characters be lowercased first?" +msgstr "" +"Sollen alle anderen Zeichen zuvor in Kleinbuchstaben umgewandelt werden?" + #: application/controllers/HostController.php:351 msgid "Show" msgstr "Zeigen" @@ -5181,6 +5186,10 @@ msgstr "Benutzung" msgid "Use a local file or network share" msgstr "Benutze eine lokales Verzeichnis oder eine Netzwerkfreigabe" +#: library/Director/PropertyModifier/PropertyModifierUpperCaseFirst.php:18 +msgid "Use lowercase first" +msgstr "Erst in Kleinbuchstaben umwandeln" + #: application/forms/SyncPropertyForm.php:244 msgid "Used sources" msgstr "Verwendete Quellen" diff --git a/doc/82-Changelog.md b/doc/82-Changelog.md index 6fa1d6c6..aaf895e4 100644 --- a/doc/82-Changelog.md +++ b/doc/82-Changelog.md @@ -27,6 +27,8 @@ before switching to a new version. however allowed to store invalid single Service Objects with no Host. This is now illegal, as it never makes any sense * FEATURE: new Property Modifier for IPs formatted as number in Excel files (#1296) +* FEATURE: new Property Modifier to url-encode values +* FEATURE: new Property Modifier: uppercase the first character of each word 1.4.2 ----- diff --git a/library/Director/PropertyModifier/PropertyModifierUpperCaseFirst.php b/library/Director/PropertyModifier/PropertyModifierUpperCaseFirst.php new file mode 100644 index 00000000..956ce5af --- /dev/null +++ b/library/Director/PropertyModifier/PropertyModifierUpperCaseFirst.php @@ -0,0 +1,40 @@ +addElement('select', 'lowerfirst', array( + 'label' => $form->translate('Use lowercase first'), + 'required' => true, + 'description' => $form->translate( + 'Should all the other characters be lowercased first?' + ), + 'value' => 'y', + 'multiOptions' => array( + 'y' => $form->translate('Yes'), + 'n' => $form->translate('No'), + ), + )); + } + + + public function transform($value) + { + if ($this->getSetting('lowerfirst', 'y') === 'y') { + return ucwords(strtolower($value)); + } else { + return ucwords($value); + } + } +} diff --git a/run.php b/run.php index dd7c48b9..2a60e346 100644 --- a/run.php +++ b/run.php @@ -50,6 +50,7 @@ $this->provideHook('director/PropertyModifier', $prefix . 'PropertyModifier\\Pro $this->provideHook('director/PropertyModifier', $prefix . 'PropertyModifier\\PropertyModifierCombine'); $this->provideHook('director/PropertyModifier', $prefix . 'PropertyModifier\\PropertyModifierXlsNumericIp'); $this->provideHook('director/PropertyModifier', $prefix . 'PropertyModifier\\PropertyModifierURLEncode'); +$this->provideHook('director/PropertyModifier', $prefix . 'PropertyModifier\\PropertyModifierUpperCaseFirst'); $this->provideHook('director/Job', $prefix . 'Job\\HousekeepingJob'); $this->provideHook('director/Job', $prefix . 'Job\\ConfigJob');