Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
d24c6ee7
Commit
d24c6ee7
authored
Dec 19, 2012
by
Dries
Browse files
Issue
#1869292
by Gábor Hojtsy: Remove confusing 'multiple' language from core.
parent
2df1b2a2
Changes
3
Hide whitespace changes
Inline
Side-by-side
core/includes/bootstrap.inc
View file @
d24c6ee7
...
...
@@ -216,18 +216,6 @@
*/
const
LANGUAGE_NOT_APPLICABLE
=
'zxx'
;
/**
* The language code used when multiple languages could be applied.
*
* Should be used when individual parts of the data cannot be marked with
* language, but we know there are multiple languages involved. Such as a
* PDF file for an electronic appliance, which has usage manuals in 8
* languages but is uploaded as one file in Drupal.
*
* Defined by ISO639-2 for "Multiple languages".
*/
const
LANGUAGE_MULTIPLE
=
'mul'
;
/**
* Language code referring to the default language of data, e.g. of an entity.
*
...
...
@@ -2763,11 +2751,6 @@ function language_default_locked_languages($weight = 0) {
'name'
=>
t
(
'Not applicable'
),
'weight'
=>
++
$weight
,
)
+
$locked_language
);
$languages
[
LANGUAGE_MULTIPLE
]
=
new
Language
(
array
(
'langcode'
=>
LANGUAGE_MULTIPLE
,
'name'
=>
t
(
'Multiple'
),
'weight'
=>
++
$weight
,
)
+
$locked_language
);
return
$languages
;
}
...
...
core/modules/language/language.admin.inc
View file @
d24c6ee7
...
...
@@ -40,9 +40,6 @@ function language_admin_overview_form($form, &$form_state) {
case
LANGUAGE_NOT_SPECIFIED
:
$description
=
t
(
'Use this when the language is not (yet) known.'
);
break
;
case
LANGUAGE_MULTIPLE
:
$description
=
t
(
'Use this when multiple languages can be assigned, such as a multilingual PDF.'
);
break
;
}
if
(
!
empty
(
$description
))
{
$title
.
=
'<div class="description">'
.
$description
.
'</div>'
;
...
...
core/modules/language/lib/Drupal/language/Tests/LanguageListTest.php
View file @
d24c6ee7
...
...
@@ -177,8 +177,8 @@ function testLanguageStates() {
language_save
(
new
Language
(
array
(
'name'
=>
$this
->
randomName
(),
'langcode'
=>
'l2'
,
'locked'
=>
TRUE
)));
language_save
(
new
Language
(
array
(
'name'
=>
$this
->
randomName
(),
'langcode'
=>
'l3'
)));
language_save
(
new
Language
(
array
(
'name'
=>
$this
->
randomName
(),
'langcode'
=>
'l4'
,
'locked'
=>
TRUE
)));
$expected_locked_languages
=
array
(
'l4'
=>
'l4'
,
'l2'
=>
'l2'
,
'und'
=>
'und'
,
'zxx'
=>
'zxx'
,
'mul'
=>
'mul'
);
$expected_all_languages
=
array
(
'l4'
=>
'l4'
,
'l3'
=>
'l3'
,
'l2'
=>
'l2'
,
'l1'
=>
'l1'
,
'en'
=>
'en'
,
'und'
=>
'und'
,
'zxx'
=>
'zxx'
,
'mul'
=>
'mul'
);
$expected_locked_languages
=
array
(
'l4'
=>
'l4'
,
'l2'
=>
'l2'
,
'und'
=>
'und'
,
'zxx'
=>
'zxx'
);
$expected_all_languages
=
array
(
'l4'
=>
'l4'
,
'l3'
=>
'l3'
,
'l2'
=>
'l2'
,
'l1'
=>
'l1'
,
'en'
=>
'en'
,
'und'
=>
'und'
,
'zxx'
=>
'zxx'
);
$expected_conf_languages
=
array
(
'l3'
=>
'l3'
,
'l1'
=>
'l1'
,
'en'
=>
'en'
);
$locked_languages
=
language_list
(
LANGUAGE_LOCKED
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment