summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbart.hanssens2012-10-05 06:23:39 (GMT)
committer bart.hanssens2012-10-05 06:23:39 (GMT)
commit70fb2669d1d88b189b56f2ca46439b93f0373c4a (patch)
treefd272182addc01d32e5002b8ad633ba9b7f8db22
parent6eb39d6cc3e57fcb797bbc3a7937aebfb289341c (diff)
Issue #1803790: moved i18n from ferry_basic Feature to ferry_i18n
-rw-r--r--CHANGELOG.txt2
-rw-r--r--modules/features/ferry_basic/ferry_basic.features.user_permission.inc71
-rw-r--r--modules/features/ferry_basic/ferry_basic.info30
-rw-r--r--modules/features/ferry_basic/ferry_basic.variable.inc54
-rw-r--r--modules/features/ferry_i18n/ferry_i18n.features.user_permission.inc94
-rw-r--r--modules/features/ferry_i18n/ferry_i18n.info35
-rw-r--r--modules/features/ferry_i18n/ferry_i18n.module5
-rw-r--r--modules/features/ferry_i18n/ferry_i18n.variable.inc71
8 files changed, 207 insertions, 155 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3ec5491..d87311c 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,6 @@
7.x-0.8
-------
+Issue #1803790: moved i18n from ferry_basic Feature to ferry_i18n
Issue #1803112: disabled i18n_redirect
Issue #1800496: upgraded apachesolr
@@ -37,6 +38,7 @@ Issue #1772452: upgraded apachesolr_confgen
7.x-0.5
-------
+
Issue #1757850: changed colorbox library url
Issue #1757400: upgraded ds to 2.0-beta3
Issue #1765120: upgraded message_notify
diff --git a/modules/features/ferry_basic/ferry_basic.features.user_permission.inc b/modules/features/ferry_basic/ferry_basic.features.user_permission.inc
index d3d1730..127fc8f 100644
--- a/modules/features/ferry_basic/ferry_basic.features.user_permission.inc
+++ b/modules/features/ferry_basic/ferry_basic.features.user_permission.inc
@@ -216,16 +216,6 @@ function ferry_basic_user_default_permissions() {
'module' => 'contact',
);
- // Exported permission: administer content translations.
- $permissions['administer content translations'] = array(
- 'name' => 'administer content translations',
- 'roles' => array(
- 0 => 'administrator',
- 1 => 'editor-in-chief',
- ),
- 'module' => 'i18n_node',
- );
-
// Exported permission: administer content types.
$permissions['administer content types'] = array(
'name' => 'administer content types',
@@ -733,15 +723,6 @@ function ferry_basic_user_default_permissions() {
'module' => 'media',
);
- // Exported permission: manage en translation overview priorities.
- $permissions['manage en translation overview priorities'] = array(
- 'name' => 'manage en translation overview priorities',
- 'roles' => array(
- 0 => 'administrator',
- ),
- 'module' => 'translation_overview',
- );
-
// Exported permission: manage features.
$permissions['manage features'] = array(
'name' => 'manage features',
@@ -851,48 +832,6 @@ function ferry_basic_user_default_permissions() {
'module' => 'shortcut',
);
- // Exported permission: translate admin strings.
- $permissions['translate admin strings'] = array(
- 'name' => 'translate admin strings',
- 'roles' => array(
- 0 => 'administrator',
- ),
- 'module' => 'i18n_string',
- );
-
- // Exported permission: translate content.
- $permissions['translate content'] = array(
- 'name' => 'translate content',
- 'roles' => array(
- 0 => 'administrator',
- 1 => 'editor',
- 2 => 'editor-in-chief',
- ),
- 'module' => 'translation',
- );
-
- // Exported permission: translate interface.
- $permissions['translate interface'] = array(
- 'name' => 'translate interface',
- 'roles' => array(
- 0 => 'administrator',
- 1 => 'editor',
- 2 => 'editor-in-chief',
- ),
- 'module' => 'locale',
- );
-
- // Exported permission: translate user-defined strings.
- $permissions['translate user-defined strings'] = array(
- 'name' => 'translate user-defined strings',
- 'roles' => array(
- 0 => 'administrator',
- 1 => 'editor',
- 2 => 'editor-in-chief',
- ),
- 'module' => 'i18n_string',
- );
-
// Exported permission: use advanced search.
$permissions['use advanced search'] = array(
'name' => 'use advanced search',
@@ -977,15 +916,5 @@ function ferry_basic_user_default_permissions() {
'module' => 'system',
);
- // Exported permission: view translation overview assigments.
- $permissions['view translation overview assigments'] = array(
- 'name' => 'view translation overview assigments',
- 'roles' => array(
- 0 => 'administrator',
- 1 => 'editor-in-chief',
- ),
- 'module' => 'translation_overview',
- );
-
return $permissions;
}
diff --git a/modules/features/ferry_basic/ferry_basic.info b/modules/features/ferry_basic/ferry_basic.info
index dfa39eb..be67c28 100644
--- a/modules/features/ferry_basic/ferry_basic.info
+++ b/modules/features/ferry_basic/ferry_basic.info
@@ -25,7 +25,6 @@ dependencies[] = entity
dependencies[] = entity_token
dependencies[] = extlink
dependencies[] = facetapi
-dependencies[] = facetapi_i18n
dependencies[] = features
dependencies[] = field
dependencies[] = field_group
@@ -37,24 +36,8 @@ dependencies[] = filter
dependencies[] = help
dependencies[] = html5_media
dependencies[] = html5_tools
-dependencies[] = i18n
-dependencies[] = i18n_block
-dependencies[] = i18n_contact
-dependencies[] = i18n_field
-dependencies[] = i18n_menu
-dependencies[] = i18n_node
-dependencies[] = i18n_path
-dependencies[] = i18n_select
-dependencies[] = i18n_string
-dependencies[] = i18n_sync
-dependencies[] = i18n_taxonomy
-dependencies[] = i18n_translation
-dependencies[] = i18n_variable
-dependencies[] = i18nviews
dependencies[] = image
dependencies[] = imce
-dependencies[] = lang_dropdown
-dependencies[] = languageicons
dependencies[] = libraries
dependencies[] = link
dependencies[] = linkit
@@ -85,10 +68,6 @@ dependencies[] = taxonomy
dependencies[] = text
dependencies[] = token
dependencies[] = toolbar
-dependencies[] = translation
-dependencies[] = translation_overview
-dependencies[] = translation_table
-dependencies[] = transliteration
dependencies[] = variable
dependencies[] = variable_admin
dependencies[] = variable_realm
@@ -97,7 +76,6 @@ dependencies[] = views
dependencies[] = views_ui
dependencies[] = xmlsitemap
dependencies[] = xmlsitemap_engines
-dependencies[] = xmlsitemap_i18n
dependencies[] = xmlsitemap_node
dependencies[] = xmlsitemap_taxonomy
features[features_api][] = api:1
@@ -122,7 +100,6 @@ features[user_permission][] = administer actions
features[user_permission][] = administer blocks
features[user_permission][] = administer comments
features[user_permission][] = administer contact forms
-features[user_permission][] = administer content translations
features[user_permission][] = administer content types
features[user_permission][] = administer date tools
features[user_permission][] = administer facets
@@ -132,7 +109,6 @@ features[user_permission][] = administer files
features[user_permission][] = administer filters
features[user_permission][] = administer image styles
features[user_permission][] = administer imce
-features[user_permission][] = administer languages
features[user_permission][] = administer linkit
features[user_permission][] = administer menu
features[user_permission][] = administer modules
@@ -175,7 +151,6 @@ features[user_permission][] = edit own comments
features[user_permission][] = edit own page content
features[user_permission][] = edit terms in 1
features[user_permission][] = import media
-features[user_permission][] = manage en translation overview priorities
features[user_permission][] = manage features
features[user_permission][] = node-specific print configuration
features[user_permission][] = notify of path changes
@@ -187,10 +162,6 @@ features[user_permission][] = select account cancellation method
features[user_permission][] = set page title
features[user_permission][] = skip comment approval
features[user_permission][] = switch shortcut sets
-features[user_permission][] = translate admin strings
-features[user_permission][] = translate content
-features[user_permission][] = translate interface
-features[user_permission][] = translate user-defined strings
features[user_permission][] = use advanced search
features[user_permission][] = use text format filtered_html
features[user_permission][] = use text format full_html
@@ -199,7 +170,6 @@ features[user_permission][] = view own unpublished content
features[user_permission][] = view post access counter
features[user_permission][] = view revisions
features[user_permission][] = view the administration theme
-features[user_permission][] = view translation overview assigments
features[user_role][] = administrator
features[user_role][] = editor
features[user_role][] = editor-in-chief
diff --git a/modules/features/ferry_basic/ferry_basic.variable.inc b/modules/features/ferry_basic/ferry_basic.variable.inc
index 76b0789..858aac3 100644
--- a/modules/features/ferry_basic/ferry_basic.variable.inc
+++ b/modules/features/ferry_basic/ferry_basic.variable.inc
@@ -34,60 +34,6 @@ function ferry_basic_variable_realm_default_variables() {
'enable_revisions_page_article' => 1,
'enable_revisions_page_page' => 1,
'filter_fallback_format' => 'plain_text',
- 'i18n_node_extended_article' => '1',
- 'i18n_node_extended_page' => '1',
- 'i18n_node_options_article' => array(
- 0 => 'required',
- ),
- 'i18n_node_options_page' => array(
- 0 => 'required',
- ),
- 'i18n_sync_node_type_article' => array(
- 0 => 'comment',
- 1 => 'status',
- 2 => 'promote',
- 3 => 'moderate',
- 4 => 'sticky',
- ),
- 'i18n_sync_node_type_page' => array(
- 0 => 'comment',
- 1 => 'status',
- 2 => 'promote',
- 3 => 'moderate',
- 4 => 'sticky',
- ),
- 'language_content_type_article' => '2',
- 'language_content_type_page' => '2',
- 'language_negotiation_language' => array(),
- 'language_negotiation_language_content' => array(
- 'locale-interface' => array(
- 'callbacks' => array(
- 'language' => 'locale_language_from_interface',
- ),
- 'file' => 'includes/locale.inc',
- ),
- ),
- 'language_negotiation_language_url' => array(
- 'locale-url' => array(
- 'callbacks' => array(
- 'language' => 'locale_language_from_url',
- 'switcher' => 'locale_language_switcher_url',
- 'url_rewrite' => 'locale_language_url_rewrite_url',
- ),
- 'file' => 'includes/locale.inc',
- ),
- 'locale-url-fallback' => array(
- 'callbacks' => array(
- 'language' => 'locale_language_url_fallback',
- ),
- 'file' => 'includes/locale.inc',
- ),
- ),
- 'language_types' => array(
- 'language' => TRUE,
- 'language_content' => FALSE,
- 'language_url' => FALSE,
- ),
'node_options_article' => array(
0 => 'status',
1 => 'promote',
diff --git a/modules/features/ferry_i18n/ferry_i18n.features.user_permission.inc b/modules/features/ferry_i18n/ferry_i18n.features.user_permission.inc
new file mode 100644
index 0000000..ffd66a8
--- /dev/null
+++ b/modules/features/ferry_i18n/ferry_i18n.features.user_permission.inc
@@ -0,0 +1,94 @@
+<?php
+/**
+ * @file
+ * ferry_i18n.features.user_permission.inc
+ */
+
+/**
+ * Implements hook_user_default_permissions().
+ */
+function ferry_i18n_user_default_permissions() {
+ $permissions = array();
+
+ // Exported permission: administer content translations.
+ $permissions['administer content translations'] = array(
+ 'name' => 'administer content translations',
+ 'roles' => array(
+ 0 => 'administrator',
+ 1 => 'editor-in-chief',
+ ),
+ 'module' => 'i18n_node',
+ );
+
+ // Exported permission: administer languages.
+ $permissions['administer languages'] = array(
+ 'name' => 'administer languages',
+ 'roles' => array(
+ 0 => 'administrator',
+ ),
+ 'module' => 'locale',
+ );
+
+ // Exported permission: manage en translation overview priorities.
+ $permissions['manage en translation overview priorities'] = array(
+ 'name' => 'manage en translation overview priorities',
+ 'roles' => array(
+ 0 => 'administrator',
+ ),
+ 'module' => 'translation_overview',
+ );
+
+ // Exported permission: translate admin strings.
+ $permissions['translate admin strings'] = array(
+ 'name' => 'translate admin strings',
+ 'roles' => array(
+ 0 => 'administrator',
+ ),
+ 'module' => 'i18n_string',
+ );
+
+ // Exported permission: translate content.
+ $permissions['translate content'] = array(
+ 'name' => 'translate content',
+ 'roles' => array(
+ 0 => 'administrator',
+ 1 => 'editor',
+ 2 => 'editor-in-chief',
+ ),
+ 'module' => 'translation',
+ );
+
+ // Exported permission: translate interface.
+ $permissions['translate interface'] = array(
+ 'name' => 'translate interface',
+ 'roles' => array(
+ 0 => 'administrator',
+ 1 => 'editor',
+ 2 => 'editor-in-chief',
+ ),
+ 'module' => 'locale',
+ );
+
+ // Exported permission: translate user-defined strings.
+ $permissions['translate user-defined strings'] = array(
+ 'name' => 'translate user-defined strings',
+ 'roles' => array(
+ 0 => 'administrator',
+ 1 => 'editor',
+ 2 => 'editor-in-chief',
+ ),
+ 'module' => 'i18n_string',
+ );
+
+ // Exported permission: view translation overview assigments.
+ $permissions['view translation overview assigments'] = array(
+ 'name' => 'view translation overview assigments',
+ 'roles' => array(
+ 0 => 'administrator',
+ 1 => 'editor-in-chief',
+ ),
+ 'module' => 'translation_overview',
+ );
+
+ return $permissions;
+}
diff --git a/modules/features/ferry_i18n/ferry_i18n.info b/modules/features/ferry_i18n/ferry_i18n.info
new file mode 100644
index 0000000..cd899b2
--- /dev/null
+++ b/modules/features/ferry_i18n/ferry_i18n.info
@@ -0,0 +1,35 @@
+name = Ferry i18n
+description = i18n modules and permissions
+core = 7.x
+package = Features
+dependencies[] = facetapi_i18n
+dependencies[] = i18n
+dependencies[] = i18n_block
+dependencies[] = i18n_contact
+dependencies[] = i18n_field
+dependencies[] = i18n_menu
+dependencies[] = i18n_node
+dependencies[] = i18n_path
+dependencies[] = i18n_select
+dependencies[] = i18n_string
+dependencies[] = i18n_sync
+dependencies[] = i18n_taxonomy
+dependencies[] = i18n_translation
+dependencies[] = i18n_variable
+dependencies[] = i18nviews
+dependencies[] = lang_dropdown
+dependencies[] = languageicons
+dependencies[] = translation
+dependencies[] = translation_overview
+dependencies[] = translation_table
+dependencies[] = transliteration
+dependencies[] = xmlsitemap_i18n
+features[features_api][] = api:1
+features[user_permission][] = administer content translations
+features[user_permission][] = administer languages
+features[user_permission][] = manage en translation overview priorities
+features[user_permission][] = translate admin strings
+features[user_permission][] = translate content
+features[user_permission][] = translate interface
+features[user_permission][] = translate user-defined strings
+features[user_permission][] = view translation overview assigments
diff --git a/modules/features/ferry_i18n/ferry_i18n.module b/modules/features/ferry_i18n/ferry_i18n.module
new file mode 100644
index 0000000..44788b0
--- /dev/null
+++ b/modules/features/ferry_i18n/ferry_i18n.module
@@ -0,0 +1,5 @@
+<?php
+/**
+ * @file
+ * Drupal needs this blank file.
+ */
diff --git a/modules/features/ferry_i18n/ferry_i18n.variable.inc b/modules/features/ferry_i18n/ferry_i18n.variable.inc
new file mode 100644
index 0000000..c92a987
--- /dev/null
+++ b/modules/features/ferry_i18n/ferry_i18n.variable.inc
@@ -0,0 +1,71 @@
+<?php
+/**
+ * @file
+ * ferry_18n.variable.inc
+ */
+
+/**
+ * Implements hook_variable_realm_default_variables().
+ */
+function ferry_i18n_variable_realm_default_variables() {
+ $realm_variables = array();
+
+ $realm_variables['global']['default'] = array(
+ 'i18n_node_extended_article' => '1',
+ 'i18n_node_extended_page' => '1',
+ 'i18n_node_options_article' => array(
+ 0 => 'required',
+ ),
+ 'i18n_node_options_page' => array(
+ 0 => 'required',
+ ),
+ 'i18n_sync_node_type_article' => array(
+ 0 => 'comment',
+ 1 => 'status',
+ 2 => 'promote',
+ 3 => 'moderate',
+ 4 => 'sticky',
+ ),
+ 'i18n_sync_node_type_page' => array(
+ 0 => 'comment',
+ 1 => 'status',
+ 2 => 'promote',
+ 3 => 'moderate',
+ 4 => 'sticky',
+ ),
+ 'language_content_type_article' => '2',
+ 'language_content_type_page' => '2',
+ 'language_negotiation_language' => array(),
+ 'language_negotiation_language_content' => array(
+ 'locale-interface' => array(
+ 'callbacks' => array(
+ 'language' => 'locale_language_from_interface',
+ ),
+ 'file' => 'includes/locale.inc',
+ ),
+ ),
+ 'language_negotiation_language_url' => array(
+ 'locale-url' => array(
+ 'callbacks' => array(
+ 'language' => 'locale_language_from_url',
+ 'switcher' => 'locale_language_switcher_url',
+ 'url_rewrite' => 'locale_language_url_rewrite_url',
+ ),
+ 'file' => 'includes/locale.inc',
+ ),
+ 'locale-url-fallback' => array(
+ 'callbacks' => array(
+ 'language' => 'locale_language_url_fallback',
+ ),
+ 'file' => 'includes/locale.inc',
+ ),
+ ),
+ 'language_types' => array(
+ 'language' => TRUE,
+ 'language_content' => FALSE,
+ 'language_url' => FALSE,
+ ),
+ );
+
+ return $realm_variables;
+}