tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

ENHANCEMENT: Coding conventions, wording

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42730 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2007-09-27 20:59:46 +00:00
parent 064816240f
commit 6ec4b77cd5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
forms/LanguageDropdownField.php
View File

@ -12,11 +12,11 @@ class LanguageDropdownField extends GroupedDropdownField {
* @param string $title * @param string $title
* @param array $dontInclude list of languages that won't be included * @param array $dontInclude list of languages that won't be included
* @param string $translatingClass Name of the class with translated instances where to look for used languages * @param string $translatingClass Name of the class with translated instances where to look for used languages
* @param string $list Indicates the source language list. Can be either Common-English, Common-Native or Locale * @param string $list Indicates the source language list. Can be either Common-English, Common-Native Locale
*/ */
function __construct($name, $title, $dontInclude = array(), $translatingClass = 'SiteTree', $list = 'Common-English' ) { function __construct($name, $title, $dontInclude = array(), $translatingClass = 'SiteTree', $list = 'Common-English' ) {
$usedlangs = array_diff( $usedlangs = array_diff(
i18n::get_existing_languages($translatingClass), i18n::get_existing_content_languages($translatingClass),
$dontInclude $dontInclude
); );
// we accept in dontInclude both language codes and names, so another diff is required // we accept in dontInclude both language codes and names, so another diff is required
@ -24,6 +24,7 @@ class LanguageDropdownField extends GroupedDropdownField {
array_flip($usedlangs), array_flip($usedlangs),
$dontInclude $dontInclude
)); ));
if (isset($usedlangs[Translatable::default_lang()])) unset($usedlangs[Translatable::default_lang()]); if (isset($usedlangs[Translatable::default_lang()])) unset($usedlangs[Translatable::default_lang()]);
if ('Common-English' == $list) $languageList = i18n::get_common_languages(); if ('Common-English' == $list) $languageList = i18n::get_common_languages();
@ -45,7 +46,7 @@ class LanguageDropdownField extends GroupedDropdownField {
if (count($usedlangs)) { if (count($usedlangs)) {
asort($usedlangs); asort($usedlangs);
parent::__construct($name, $title, array( parent::__construct($name, $title, array(
"Used languages" => $usedlangs, "Available languages" => $usedlangs,
"Other languages" => $alllangs "Other languages" => $alllangs
), ),
reset($usedlangs) reset($usedlangs)