diff --git a/sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc b/sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc
index f10d5bd0..2fbf9342 100644
--- a/sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc
+++ b/sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc
@@ -229,6 +229,15 @@ function materio_administration_user_default_permissions() {
'module' => 'role_delegation',
);
+ // Exported permission: 'assign Translator role'.
+ $permissions['assign Translator role'] = array(
+ 'name' => 'assign Translator role',
+ 'roles' => array(
+ 'administrator' => 'administrator',
+ ),
+ 'module' => 'role_delegation',
+ );
+
// Exported permission: 'assign Unverified role'.
$permissions['assign Unverified role'] = array(
'name' => 'assign Unverified role',
@@ -393,6 +402,7 @@ function materio_administration_user_default_permissions() {
$permissions['edit any breve content'] = array(
'name' => 'edit any breve content',
'roles' => array(
+ 'Translator' => 'Translator',
'administrator' => 'administrator',
'root' => 'root',
),
diff --git a/sites/all/modules/features/materio_administration/materio_administration.info b/sites/all/modules/features/materio_administration/materio_administration.info
index 5f6bd154..045e429c 100644
--- a/sites/all/modules/features/materio_administration/materio_administration.info
+++ b/sites/all/modules/features/materio_administration/materio_administration.info
@@ -110,6 +110,7 @@ features[user_permission][] = assign Adhérent role
features[user_permission][] = assign Contact opérationnel role
features[user_permission][] = assign Premium role
features[user_permission][] = assign Student role
+features[user_permission][] = assign Translator role
features[user_permission][] = assign Unverified role
features[user_permission][] = assign Utilisateur Alpha Tester role
features[user_permission][] = assign Utilisateur role
diff --git a/sites/all/modules/features/materio_administration/materio_administration.views_default.inc b/sites/all/modules/features/materio_administration/materio_administration.views_default.inc
index cd5e62bd..acb8588c 100644
--- a/sites/all/modules/features/materio_administration/materio_administration.views_default.inc
+++ b/sites/all/modules/features/materio_administration/materio_administration.views_default.inc
@@ -251,7 +251,6 @@ function materio_administration_views_default_views() {
$handler->display->display_options['access']['role'] = array(
3 => '3',
4 => '4',
- 12 => '12',
);
$handler->display->display_options['cache']['type'] = 'none';
$handler->display->display_options['query']['type'] = 'views_query';
@@ -1451,6 +1450,13 @@ function materio_administration_views_default_views() {
'postpone_processing' => 0,
),
);
+ /* Field: Content: Nid */
+ $handler->display->display_options['fields']['nid']['id'] = 'nid';
+ $handler->display->display_options['fields']['nid']['table'] = 'node';
+ $handler->display->display_options['fields']['nid']['field'] = 'nid';
+ $handler->display->display_options['fields']['nid']['label'] = '';
+ $handler->display->display_options['fields']['nid']['exclude'] = TRUE;
+ $handler->display->display_options['fields']['nid']['element_label_colon'] = FALSE;
/* Field: Content: Type */
$handler->display->display_options['fields']['type']['id'] = 'type';
$handler->display->display_options['fields']['type']['table'] = 'node';
@@ -1470,6 +1476,12 @@ function materio_administration_views_default_views() {
$handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
$handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = TRUE;
$handler->display->display_options['fields']['edit_node']['alter']['text'] = '[edit_node]';
+ /* Field: Global: Custom text */
+ $handler->display->display_options['fields']['nothing']['id'] = 'nothing';
+ $handler->display->display_options['fields']['nothing']['table'] = 'views';
+ $handler->display->display_options['fields']['nothing']['field'] = 'nothing';
+ $handler->display->display_options['fields']['nothing']['label'] = 'Translate';
+ $handler->display->display_options['fields']['nothing']['alter']['text'] = 'Translate';
/* Field: Field: Mémo */
$handler->display->display_options['fields']['field_memo']['id'] = 'field_memo';
$handler->display->display_options['fields']['field_memo']['table'] = 'field_data_field_memo';
@@ -1508,11 +1520,13 @@ function materio_administration_views_default_views() {
$handler->display->display_options['filters']['type_1']['value'] = array(
'breve' => 'breve',
'company' => 'company',
+ 'simplenews' => 'simplenews',
'materiau' => 'materiau',
'panel' => 'panel',
'product' => 'product',
- 'simplenews' => 'simplenews',
+ 'showroom' => 'showroom',
'webform' => 'webform',
+ 'looping_embed_video' => 'looping_embed_video',
);
$handler->display->display_options['filters']['type_1']['group'] = 1;
/* Filter criterion: Content: Title */
diff --git a/sites/all/modules/features/translations/translations.features.user_permission.inc b/sites/all/modules/features/translations/translations.features.user_permission.inc
index 2fe51972..a6bea1c5 100644
--- a/sites/all/modules/features/translations/translations.features.user_permission.inc
+++ b/sites/all/modules/features/translations/translations.features.user_permission.inc
@@ -10,6 +10,25 @@
function translations_user_default_permissions() {
$permissions = array();
+ // Exported permission: 'access selected languages'.
+ $permissions['access selected languages'] = array(
+ 'name' => 'access selected languages',
+ 'roles' => array(
+ 'administrator' => 'administrator',
+ 'root' => 'root',
+ ),
+ 'module' => 'materio_translator',
+ );
+
+ // Exported permission: 'administer content translations'.
+ $permissions['administer content translations'] = array(
+ 'name' => 'administer content translations',
+ 'roles' => array(
+ 'root' => 'root',
+ ),
+ 'module' => 'i18n_node',
+ );
+
// Exported permission: 'administer languages'.
$permissions['administer languages'] = array(
'name' => 'administer languages',
@@ -29,6 +48,15 @@ function translations_user_default_permissions() {
'module' => 'materio_translator',
);
+ // Exported permission: 'delete_strings'.
+ $permissions['delete_strings'] = array(
+ 'name' => 'delete_strings',
+ 'roles' => array(
+ 'root' => 'root',
+ ),
+ 'module' => 'materio_translator',
+ );
+
// Exported permission: 'translate interface'.
$permissions['translate interface'] = array(
'name' => 'translate interface',
diff --git a/sites/all/modules/features/translations/translations.info b/sites/all/modules/features/translations/translations.info
index 243d4a5c..240f6d6e 100644
--- a/sites/all/modules/features/translations/translations.info
+++ b/sites/all/modules/features/translations/translations.info
@@ -2,13 +2,19 @@ name = Translations
core = 7.x
package = Materio
version = 7.x-1.0-beta
+dependencies[] = i18n_node
+dependencies[] = locale
dependencies[] = materio_translator
+dependencies[] = strongarm
features[ctools][] = strongarm:strongarm:1
features[features_api][] = api:2
features[language][] = en
features[language][] = fr
+features[user_permission][] = access selected languages
+features[user_permission][] = administer content translations
features[user_permission][] = administer languages
features[user_permission][] = administer user translation language access
+features[user_permission][] = delete_strings
features[user_permission][] = translate interface
features[user_role][] = Translator
features[variable][] = i18n_node_translation_switch
@@ -19,6 +25,4 @@ features[variable][] = materio_translator_languages
features[variable][] = taxonomy_csv_locale_custom
features_exclude[dependencies][ctools] = ctools
features_exclude[dependencies][features] = features
-features_exclude[dependencies][locale] = locale
-features_exclude[dependencies][strongarm] = strongarm
project path = sites/all/modules/features
diff --git a/sites/all/modules/gui/materiobasemod/materio_translator.module b/sites/all/modules/gui/materiobasemod/materio_translator.module
index e18c86d0..7362187c 100644
--- a/sites/all/modules/gui/materiobasemod/materio_translator.module
+++ b/sites/all/modules/gui/materiobasemod/materio_translator.module
@@ -303,37 +303,37 @@ function materio_translator_menu_alter(&$items) {
// }
// translation add link
- if(preg_match('/admin\/config\/regional\/translate/', $path)){
+ if(preg_match('/^admin\/config\/regional\/translate$/', $path)){
$items[$path]['access arguments'] = array('access_translations_overview');
}
- if(preg_match('/admin\/config\/regional\/translate\/table/', $path)){
+ if(preg_match('/^admin\/config\/regional\/translate\/table$/', $path)){
$items[$path]['access arguments'] = array('access_translation_table_fields');
}
- if(preg_match('/admin\/config\/regional\/translate\/table\/nodetype/', $path)){
+ if(preg_match('/^admin\/config\/regional\/translate\/table\/nodetype$/', $path)){
$items[$path]['access arguments'] = array('access_translation_table_content_type');
}
- if(preg_match('/admin\/config\/regional\/translate\/table\/menu/', $path)){
+ if(preg_match('/^admin\/config\/regional\/translate\/table\/menu$/', $path)){
$items[$path]['access arguments'] = array('access_translation_table_menu');
}
- if(preg_match('/admin\/config\/regional\/translate\/table\/taxonomy/', $path)){
+ if(preg_match('/^admin\/config\/regional\/translate\/table\/taxonomy$/', $path)){
$items[$path]['access arguments'] = array('access_translation_table_taxonomy');
}
- if(preg_match('/admin\/config\/regional\/translate\/translate/', $path)){
+ if(preg_match('/^admin\/config\/regional\/translate\/translate$/', $path)){
$items[$path]['access arguments'] = array('translate_strings');
}
- if(preg_match('/admin\/config\/regional\/translate\/import/', $path)){
+ if(preg_match('/^admin\/config\/regional\/translate\/import$/', $path)){
$items[$path]['access arguments'] = array('import_translations');
}
- if(preg_match('/admin\/config\/regional\/translate\/i18n_string/', $path)){
+ if(preg_match('/^admin\/config\/regional\/translate\/i18n_string$/', $path)){
$items[$path]['access arguments'] = array('refresh_strings');
}
- if(preg_match('/admin\/config\/regional\/translate\/update/', $path)){
+ if(preg_match('/^admin\/config\/regional\/translate\/update$/', $path)){
$items[$path]['access arguments'] = array('update_modules_translations');
}
- if(preg_match('/admin\/config\/regional\/translate\/export/', $path)){
+ if(preg_match('/^admin\/config\/regional\/translate\/export$/', $path)){
$items[$path]['access arguments'] = array('export_translations');
}
- if(preg_match('/admin\/config\/regional\/translate\/delete/', $path)){
+ if(preg_match('/^admin\/config\/regional\/translate\/delete$/', $path)){
$items[$path]['access arguments'] += array("delete_strings");
}