diff --git a/activity_log.module b/activity_log.module index 71a89c2..639e4cd 100644 --- a/activity_log.module +++ b/activity_log.module @@ -331,10 +331,6 @@ function _activity_log_rebuild_templates() { VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', %d, '%s', '%s', %d, '%s') ", $record); } - // Rebuild translations. - if (module_exists('i18nstrings')) { - activity_log_locale_refresh(); - } return count($rules); } @@ -408,50 +404,6 @@ function activity_log_activity_log_display_types() { ); } -//================== -// I18N INTEGRATION -//================== - -/** - * Implementation of hook_locale(). - */ -function activity_log_locale($op = 'groups', $group = NULL) { - switch ($op) { - case 'groups': - return array('activity_log' => t('Activity Log')); - - case 'info': - $info['activity_log']['refresh callback'] = 'activity_log_locale_refresh'; - $info['activity_log']['format'] = FALSE; - return $info; - } -} - -/** - * i18n callback to refresh all strings at once. - */ -function activity_log_locale_refresh() { - $rules = array(); - foreach (_rules_get_rule_sets() as $key => $event) { - if (strpos($key, 'event_') === 0) { - foreach ($event['rules'] as $name => $info) { - foreach ($info['#actions'] as $action) { - if ($action['#name'] == 'activity_log_log_action' && isset($action['#settings']['tid'])) { - $rules[$action['#settings']['tid']] = $action['#settings']; - } - } - } - } - } - $langcode = 'en';//language_default('language'); - ksort($rules); - foreach ($rules as $tid => $v) { - // call i18nstrings_update($name, $string) on each - i18nstrings_update('activity_log:template:'. $tid, $v['templates'][$langcode]['template']); - i18nstrings_update('activity_log:group_template:'. $tid, $v['grouping']['templates'][$langcode]['template']); - } -} - //==================== // VIEWS INTEGRATION. //==================== diff --git a/activity_log.rules.inc b/activity_log.rules.inc index 8aa9311..75f86ff 100644 --- a/activity_log.rules.inc +++ b/activity_log.rules.inc @@ -13,10 +13,7 @@ * The form callback for the activity logging action. */ function activity_log_log_action_form($settings, &$form) { - //$default_language = language_default(); - //$languages = array($default_language->language => $default_language); $languages = language_list(); - $languages = array('en' => $languages['en']); $translate = count($languages) > 1; $form['label']['#title'] = t('Administrative label'); drupal_add_js(drupal_get_path('module', 'activity_log') .'/activity_log.admin.js'); @@ -68,6 +65,10 @@ function activity_log_log_action_form($settings, &$form) { '#prefix' => '
', '#suffix' => '
', ); + $form['settings']['templates']['und']['template'] = array( + '#type' => 'value', + '#value' => '', + ); foreach ($languages as $name => $lang) { if (!isset($settings['templates'][$name])) { $settings['templates'][$name] = array('template' => ''); @@ -153,6 +154,10 @@ function activity_log_log_action_form($settings, &$form) { '#prefix' => '
', '#suffix' => '
', ); + $form['settings']['grouping']['templates']['und']['template'] = array( + '#type' => 'value', + '#value' => '', + ); foreach ($languages as $name => $lang) { if (!isset($settings['grouping']['templates'][$name])) { $settings['grouping']['templates'][$name] = array('template' => ''); @@ -383,6 +388,19 @@ function activity_log_form_alter(&$form, &$form_state, $form_id) { */ function activity_log_rules_admin_form_submit_before($form, &$form_state) { $v = $form_state['values']['settings']; + // Concatenate the language templates into the placeholder so Rules will figure out what input evaluators to use. + $und = $v['templates']['und']['template']; + foreach ($v['templates'] as $lang => $data) { + $und .= $data['template'] .' '; + } + $und_group = $v['grouping']['templates']['und']['template']; + foreach ($v['grouping']['templates'] as $lang => $data) { + $und_group .= $data['template'] .' '; + } + $form_state['values']['settings']['templates']['und']['template'] = $und; + $v['templates']['und']['template'] = $und; + $form_state['values']['settings']['grouping']['templates']['und']['template'] = $und_group; + $v['grouping']['templates']['und']['template'] = $und_group; // If we're updating, find the existing template and public name. $rule = $form_state['proxy']->_rule_name; $pid = 0; @@ -429,12 +447,6 @@ function activity_log_rules_admin_form_submit_before($form, &$form_state) { drupal_write_record('activity_log_templates', $record); } $form_state['values']['settings']['tid'] = $record->tid; - // Tell i18n we changed the string - if (module_exists('i18nstrings')) { - $langcode = 'en';//language_default('language'); - i18nstrings_update('activity_log:template:'. $record->tid, $v['templates'][$langcode]['template']); - i18nstrings_update('activity_log:group_template:'. $record->tid, $v['grouping']['templates'][$langcode]['template']); - } // If switching values means that we've now abandoned an action name, remove it. if (isset($name->pid) && $name->pid != $pid) { db_query(" @@ -724,10 +736,14 @@ function activity_log_input_evaluator_process_help($variables) { */ function activity_log_rules_action_info() { $eval_input = array('placeholder', 'grouping|group_summary', 'visibility|stream_owner_id', 'visibility|viewer_id', 'acting_uid'); + $eval_input[] = 'templates|und|template'; + $eval_input[] = 'grouping|templates|und|template'; + /* foreach (language_list() as $name => $lang) { $eval_input[] = 'templates|'. $name .'|template'; $eval_input[] = 'grouping|templates|'. $name .'|template'; } + */ return array( 'activity_log_log_action' => array( 'label' => t('Log activity'), diff --git a/activity_log.rules_defaults.inc b/activity_log.rules_defaults.inc index ec14f20..0ae3eb1 100644 --- a/activity_log.rules_defaults.inc +++ b/activity_log.rules_defaults.inc @@ -94,8 +94,8 @@ function activity_log_rules_defaults_node_insert() { 2 => 'visibility|stream_owner_id', 3 => 'visibility|viewer_id', 4 => 'acting_uid', - 5 => 'templates|en|template', - 6 => 'grouping|templates|en|template', + 5 => 'templates|und|template', + 6 => 'grouping|templates|und|template', ), ), '#name' => 'activity_log_log_action', @@ -110,6 +110,11 @@ function activity_log_rules_defaults_node_insert() { 'template' => '
[author:picture]
[author:user] added the [node:type-name] [node:title]
[node:small]
', ), + 'und' => + array ( + 'template' => '
[author:picture]
[author:user] added the [node:type-name] [node:title]
+
[node:small]
', + ), ), 'grouping' => array ( @@ -124,6 +129,10 @@ function activity_log_rules_defaults_node_insert() { array ( 'template' => '', ), + 'und' => + array ( + 'template' => '', + ), ), ), 'visibility' => @@ -204,13 +213,13 @@ function activity_log_rules_defaults_node_insert() { 0 => 'author', 1 => ':global', ), - 'templates|en|template' => + 'templates|und|template' => array ( 0 => 'node', 1 => 'author', 2 => ':global', ), - 'grouping|templates|en|template' => + 'grouping|templates|und|template' => array ( 0 => ':global', ), @@ -222,8 +231,8 @@ function activity_log_rules_defaults_node_insert() { 'visibility|stream_owner_id' => true, 'visibility|viewer_id' => true, 'acting_uid' => true, - 'templates|en|template' => true, - 'grouping|templates|en|template' => true, + 'templates|und|template' => true, + 'grouping|templates|und|template' => true, ), ), ), @@ -244,6 +253,11 @@ function activity_log_rules_defaults_node_insert() { 'template' => '
[author:picture]
[author:user] added the [node:type-name] [node:title]
[node:small]
', ), + 'und' => + array ( + 'template' => '
[author:picture]
[author:user] added the [node:type-name] [node:title]
+
[node:small]
', + ), ), 'grouping' => array ( @@ -258,6 +272,10 @@ function activity_log_rules_defaults_node_insert() { array ( 'template' => '', ), + 'und' => + array ( + 'template' => '', + ), ), ), 'visibility' => @@ -337,13 +355,13 @@ function activity_log_rules_defaults_node_insert() { array ( 0 => ':global', ), - 'templates|en|template' => + 'templates|und|template' => array ( 0 => 'node', 1 => 'author', 2 => ':global', ), - 'grouping|templates|en|template' => + 'grouping|templates|und|template' => array ( 0 => ':global', ), @@ -355,8 +373,8 @@ function activity_log_rules_defaults_node_insert() { 'visibility|stream_owner_id' => true, 'visibility|viewer_id' => true, 'acting_uid' => true, - 'templates|en|template' => true, - 'grouping|templates|en|template' => true, + 'templates|und|template' => true, + 'grouping|templates|und|template' => true, ), ), ), @@ -373,8 +391,8 @@ function activity_log_rules_defaults_node_insert() { 2 => 'visibility|stream_owner_id', 3 => 'visibility|viewer_id', 4 => 'acting_uid', - 5 => 'templates|en|template', - 6 => 'grouping|templates|en|template', + 5 => 'templates|und|template', + 6 => 'grouping|templates|und|template', ), ), '#weight' => 0, @@ -394,8 +412,8 @@ function activity_log_rules_defaults_node_insert() { 2 => 'visibility|stream_owner_id', 3 => 'visibility|viewer_id', 4 => 'acting_uid', - 5 => 'templates|en|template', - 6 => 'grouping|templates|en|template', + 5 => 'templates|und|template', + 6 => 'grouping|templates|und|template', ), ), '#name' => 'activity_log_log_action', @@ -410,6 +428,11 @@ function activity_log_rules_defaults_node_insert() { 'template' => '
[author:picture]
[author:user] added the [node:type-name] [node:title]
[node:small]
', ), + 'und' => + array ( + 'template' => '
[author:picture]
[author:user] added the [node:type-name] [node:title]
+
[node:small]
', + ), ), 'grouping' => array ( @@ -424,6 +447,10 @@ function activity_log_rules_defaults_node_insert() { array ( 'template' => '', ), + 'und' => + array ( + 'template' => '', + ), ), ), 'visibility' => @@ -503,13 +530,13 @@ function activity_log_rules_defaults_node_insert() { array ( 0 => ':global', ), - 'templates|en|template' => + 'templates|und|template' => array ( 0 => 'node', 1 => 'author', 2 => ':global', ), - 'grouping|templates|en|template' => + 'grouping|templates|und|template' => array ( 0 => ':global', ), @@ -521,8 +548,8 @@ function activity_log_rules_defaults_node_insert() { 'visibility|stream_owner_id' => true, 'visibility|viewer_id' => true, 'acting_uid' => true, - 'templates|en|template' => true, - 'grouping|templates|en|template' => true, + 'templates|und|template' => true, + 'grouping|templates|und|template' => true, ), ), ), @@ -654,8 +681,8 @@ function activity_log_rules_defaults_node_insert_og() { 2 => 'visibility|stream_owner_id', 3 => 'visibility|viewer_id', 4 => 'acting_uid', - 5 => 'templates|en|template', - 6 => 'grouping|templates|en|template', + 5 => 'templates|und|template', + 6 => 'grouping|templates|und|template', ), ), '#name' => 'activity_log_log_action', @@ -670,6 +697,11 @@ function activity_log_rules_defaults_node_insert_og() { 'template' => '
[author:picture]
[author:user] added the [node:type-name] [node:title] in [node:ogname]
[node:small]
', ), + 'und' => + array ( + 'template' => '
[author:picture]
[author:user] added the [node:type-name] [node:title] in [node:ogname]
+
[node:small]
', + ), ), 'grouping' => array ( @@ -684,6 +716,10 @@ function activity_log_rules_defaults_node_insert_og() { array ( 'template' => '', ), + 'und' => + array ( + 'template' => '', + ), ), ), 'visibility' => @@ -764,13 +800,13 @@ function activity_log_rules_defaults_node_insert_og() { 0 => 'author', 1 => ':global', ), - 'templates|en|template' => + 'templates|und|template' => array ( 0 => 'node', 1 => 'author', 2 => ':global', ), - 'grouping|templates|en|template' => + 'grouping|templates|und|template' => array ( 0 => ':global', ), @@ -782,8 +818,8 @@ function activity_log_rules_defaults_node_insert_og() { 'visibility|stream_owner_id' => true, 'visibility|viewer_id' => true, 'acting_uid' => true, - 'templates|en|template' => true, - 'grouping|templates|en|template' => true, + 'templates|und|template' => true, + 'grouping|templates|und|template' => true, ), ), ), @@ -803,8 +839,8 @@ function activity_log_rules_defaults_node_insert_og() { 2 => 'visibility|stream_owner_id', 3 => 'visibility|viewer_id', 4 => 'acting_uid', - 5 => 'templates|en|template', - 6 => 'grouping|templates|en|template', + 5 => 'templates|und|template', + 6 => 'grouping|templates|und|template', ), ), '#name' => 'activity_log_log_action', @@ -819,6 +855,11 @@ function activity_log_rules_defaults_node_insert_og() { 'template' => '
[author:picture]
[author:user] added the [node:type-name] [node:title]
[node:small]
', ), + 'und' => + array ( + 'template' => '
[author:picture]
[author:user] added the [node:type-name] [node:title]
+
[node:small]
', + ), ), 'grouping' => array ( @@ -833,6 +874,10 @@ function activity_log_rules_defaults_node_insert_og() { array ( 'template' => '', ), + 'und' => + array ( + 'template' => '', + ), ), ), 'visibility' => @@ -912,13 +957,13 @@ function activity_log_rules_defaults_node_insert_og() { array ( 0 => ':global', ), - 'templates|en|template' => + 'templates|und|template' => array ( 0 => 'node', 1 => 'author', 2 => ':global', ), - 'grouping|templates|en|template' => + 'grouping|templates|und|template' => array ( 0 => ':global', ), @@ -930,8 +975,8 @@ function activity_log_rules_defaults_node_insert_og() { 'visibility|stream_owner_id' => true, 'visibility|viewer_id' => true, 'acting_uid' => true, - 'templates|en|template' => true, - 'grouping|templates|en|template' => true, + 'templates|und|template' => true, + 'grouping|templates|und|template' => true, ), ), ), @@ -953,6 +998,11 @@ function activity_log_rules_defaults_node_insert_og() { 'template' => '
[author:picture]
[author:user] added the [node:type-name] [node:title] in [node:ogname]
[node:small]
', ), + 'und' => + array ( + 'template' => '
[author:picture]
[author:user] added the [node:type-name] [node:title] in [node:ogname]
+
[node:small]
', + ), ), 'grouping' => array ( @@ -967,6 +1017,10 @@ function activity_log_rules_defaults_node_insert_og() { array ( 'template' => '', ), + 'und' => + array ( + 'template' => '', + ), ), ), 'visibility' => @@ -1046,13 +1100,13 @@ function activity_log_rules_defaults_node_insert_og() { array ( 0 => ':global', ), - 'templates|en|template' => + 'templates|und|template' => array ( 0 => 'node', 1 => 'author', 2 => ':global', ), - 'grouping|templates|en|template' => + 'grouping|templates|und|template' => array ( 0 => ':global', ), @@ -1064,8 +1118,8 @@ function activity_log_rules_defaults_node_insert_og() { 'visibility|stream_owner_id' => true, 'visibility|viewer_id' => true, 'acting_uid' => true, - 'templates|en|template' => true, - 'grouping|templates|en|template' => true, + 'templates|und|template' => true, + 'grouping|templates|und|template' => true, ), ), ), @@ -1082,8 +1136,8 @@ function activity_log_rules_defaults_node_insert_og() { 2 => 'visibility|stream_owner_id', 3 => 'visibility|viewer_id', 4 => 'acting_uid', - 5 => 'templates|en|template', - 6 => 'grouping|templates|en|template', + 5 => 'templates|und|template', + 6 => 'grouping|templates|und|template', ), ), ), @@ -1101,8 +1155,8 @@ function activity_log_rules_defaults_node_insert_og() { 2 => 'visibility|stream_owner_id', 3 => 'visibility|viewer_id', 4 => 'acting_uid', - 5 => 'templates|en|template', - 6 => 'grouping|templates|en|template', + 5 => 'templates|und|template', + 6 => 'grouping|templates|und|template', ), ), '#name' => 'activity_log_log_action', @@ -1117,6 +1171,11 @@ function activity_log_rules_defaults_node_insert_og() { 'template' => '
[author:picture]
[author:user] added the [node:type-name] [node:title] in [node:ogname]
[node:small]
', ), + 'und' => + array ( + 'template' => '
[author:picture]
[author:user] added the [node:type-name] [node:title] in [node:ogname]
+
[node:small]
', + ), ), 'grouping' => array ( @@ -1131,6 +1190,10 @@ function activity_log_rules_defaults_node_insert_og() { array ( 'template' => '', ), + 'und' => + array ( + 'template' => '', + ), ), ), 'visibility' => @@ -1210,13 +1273,13 @@ function activity_log_rules_defaults_node_insert_og() { array ( 0 => ':global', ), - 'templates|en|template' => + 'templates|und|template' => array ( 0 => 'node', 1 => 'author', 2 => ':global', ), - 'grouping|templates|en|template' => + 'grouping|templates|und|template' => array ( 0 => ':global', ), @@ -1228,8 +1291,8 @@ function activity_log_rules_defaults_node_insert_og() { 'visibility|stream_owner_id' => true, 'visibility|viewer_id' => true, 'acting_uid' => true, - 'templates|en|template' => true, - 'grouping|templates|en|template' => true, + 'templates|und|template' => true, + 'grouping|templates|und|template' => true, ), ), ), @@ -1305,6 +1368,10 @@ function activity_log_rules_defaults_facebook_status_insert_user_self() { array ( 'template' => '[status:status-themed]', ), + 'und' => + array ( + 'template' => '[status:status-themed]', + ), ), 'grouping' => array ( @@ -1319,6 +1386,10 @@ function activity_log_rules_defaults_facebook_status_insert_user_self() { array ( 'template' => '', ), + 'und' => + array ( + 'template' => '', + ), ), ), 'visibility' => @@ -1403,12 +1474,12 @@ function activity_log_rules_defaults_facebook_status_insert_user_self() { 0 => 'status', 1 => ':global', ), - 'templates|en|template' => + 'templates|und|template' => array ( 0 => 'status', 1 => ':global', ), - 'grouping|templates|en|template' => + 'grouping|templates|und|template' => array ( 0 => ':global', ), @@ -1420,8 +1491,8 @@ function activity_log_rules_defaults_facebook_status_insert_user_self() { 'visibility|stream_owner_id' => true, 'visibility|viewer_id' => true, 'acting_uid' => true, - 'templates|en|template' => true, - 'grouping|templates|en|template' => true, + 'templates|und|template' => true, + 'grouping|templates|und|template' => true, ), ), ), @@ -1438,8 +1509,8 @@ function activity_log_rules_defaults_facebook_status_insert_user_self() { 2 => 'visibility|stream_owner_id', 3 => 'visibility|viewer_id', 4 => 'acting_uid', - 5 => 'templates|en|template', - 6 => 'grouping|templates|en|template', + 5 => 'templates|und|template', + 6 => 'grouping|templates|und|template', ), ), '#weight' => 0, @@ -1459,8 +1530,8 @@ function activity_log_rules_defaults_facebook_status_insert_user_self() { 2 => 'visibility|stream_owner_id', 3 => 'visibility|viewer_id', 4 => 'acting_uid', - 5 => 'templates|en|template', - 6 => 'grouping|templates|en|template', + 5 => 'templates|und|template', + 6 => 'grouping|templates|und|template', ), ), '#name' => 'activity_log_log_action', @@ -1474,6 +1545,10 @@ function activity_log_rules_defaults_facebook_status_insert_user_self() { array ( 'template' => '[status:status-themed]', ), + 'und' => + array ( + 'template' => '[status:status-themed]', + ), ), 'grouping' => array ( @@ -1488,6 +1563,10 @@ function activity_log_rules_defaults_facebook_status_insert_user_self() { array ( 'template' => '', ), + 'und' => + array ( + 'template' => '', + ), ), ), 'visibility' => @@ -1572,12 +1651,12 @@ function activity_log_rules_defaults_facebook_status_insert_user_self() { 0 => 'status', 1 => ':global', ), - 'templates|en|template' => + 'templates|und|template' => array ( 0 => 'status', 1 => ':global', ), - 'grouping|templates|en|template' => + 'grouping|templates|und|template' => array ( 0 => ':global', ), @@ -1589,8 +1668,8 @@ function activity_log_rules_defaults_facebook_status_insert_user_self() { 'visibility|stream_owner_id' => true, 'visibility|viewer_id' => true, 'acting_uid' => true, - 'templates|en|template' => true, - 'grouping|templates|en|template' => true, + 'templates|und|template' => true, + 'grouping|templates|und|template' => true, ), ), ), @@ -1668,8 +1747,8 @@ function activity_log_rules_defaults_facebook_status_insert_other() { 2 => 'visibility|stream_owner_id', 3 => 'visibility|viewer_id', 4 => 'acting_uid', - 5 => 'templates|en|template', - 6 => 'grouping|templates|en|template', + 5 => 'templates|und|template', + 6 => 'grouping|templates|und|template', ), ), '#name' => 'activity_log_log_action', @@ -1683,6 +1762,10 @@ function activity_log_rules_defaults_facebook_status_insert_other() { array ( 'template' => '[status:status-themed]', ), + 'und' => + array ( + 'template' => '[status:status-themed]', + ), ), 'grouping' => array ( @@ -1697,6 +1780,10 @@ function activity_log_rules_defaults_facebook_status_insert_other() { array ( 'template' => '', ), + 'und' => + array ( + 'template' => '', + ), ), ), 'visibility' => @@ -1782,12 +1869,12 @@ function activity_log_rules_defaults_facebook_status_insert_other() { 0 => 'status', 1 => ':global', ), - 'templates|en|template' => + 'templates|und|template' => array ( 0 => 'status', 1 => ':global', ), - 'grouping|templates|en|template' => + 'grouping|templates|und|template' => array ( 0 => ':global', ), @@ -1799,8 +1886,8 @@ function activity_log_rules_defaults_facebook_status_insert_other() { 'visibility|stream_owner_id' => true, 'visibility|viewer_id' => true, 'acting_uid' => true, - 'templates|en|template' => true, - 'grouping|templates|en|template' => true, + 'templates|und|template' => true, + 'grouping|templates|und|template' => true, ), ), ), @@ -1821,6 +1908,11 @@ function activity_log_rules_defaults_facebook_status_insert_other() { 'template' => '
[status:sender-picture]
[status:sender-themed] wrote a message to [status:recipient-link]
[status:created]
', ), + 'und' => + array ( + 'template' => '
[status:sender-picture]
[status:sender-themed] wrote a message to [status:recipient-link]
+
[status:created]
', + ), ), 'grouping' => array ( @@ -1835,6 +1927,10 @@ function activity_log_rules_defaults_facebook_status_insert_other() { array ( 'template' => '', ), + 'und' => + array ( + 'template' => '', + ), ), ), 'visibility' => @@ -1919,12 +2015,12 @@ function activity_log_rules_defaults_facebook_status_insert_other() { 0 => 'status', 1 => ':global', ), - 'templates|en|template' => + 'templates|und|template' => array ( 0 => 'status', 1 => ':global', ), - 'grouping|templates|en|template' => + 'grouping|templates|und|template' => array ( 0 => ':global', ), @@ -1936,8 +2032,8 @@ function activity_log_rules_defaults_facebook_status_insert_other() { 'visibility|stream_owner_id' => true, 'visibility|viewer_id' => true, 'acting_uid' => true, - 'templates|en|template' => true, - 'grouping|templates|en|template' => true, + 'templates|und|template' => true, + 'grouping|templates|und|template' => true, ), ), ), @@ -1954,8 +2050,8 @@ function activity_log_rules_defaults_facebook_status_insert_other() { 2 => 'visibility|stream_owner_id', 3 => 'visibility|viewer_id', 4 => 'acting_uid', - 5 => 'templates|en|template', - 6 => 'grouping|templates|en|template', + 5 => 'templates|und|template', + 6 => 'grouping|templates|und|template', ), ), ), @@ -1974,8 +2070,8 @@ function activity_log_rules_defaults_facebook_status_insert_other() { 2 => 'visibility|stream_owner_id', 3 => 'visibility|viewer_id', 4 => 'acting_uid', - 5 => 'templates|en|template', - 6 => 'grouping|templates|en|template', + 5 => 'templates|und|template', + 6 => 'grouping|templates|und|template', ), ), '#name' => 'activity_log_log_action', @@ -1989,6 +2085,10 @@ function activity_log_rules_defaults_facebook_status_insert_other() { array ( 'template' => '[status:status-themed]', ), + 'und' => + array ( + 'template' => '[status:status-themed]', + ), ), 'grouping' => array ( @@ -2003,6 +2103,10 @@ function activity_log_rules_defaults_facebook_status_insert_other() { array ( 'template' => '', ), + 'und' => + array ( + 'template' => '', + ), ), ), 'visibility' => @@ -2086,12 +2190,12 @@ function activity_log_rules_defaults_facebook_status_insert_other() { array ( 0 => ':global', ), - 'templates|en|template' => + 'templates|und|template' => array ( 0 => 'status', 1 => ':global', ), - 'grouping|templates|en|template' => + 'grouping|templates|und|template' => array ( 0 => ':global', ), @@ -2103,8 +2207,8 @@ function activity_log_rules_defaults_facebook_status_insert_other() { 'visibility|stream_owner_id' => true, 'visibility|viewer_id' => true, 'acting_uid' => true, - 'templates|en|template' => true, - 'grouping|templates|en|template' => true, + 'templates|und|template' => true, + 'grouping|templates|und|template' => true, ), ), ), @@ -2179,6 +2283,10 @@ function activity_log_rules_defaults_fbsmp_insert_user_self() { array ( 'template' => '[status:status-themed]', ), + 'und' => + array ( + 'template' => '[status:status-themed]', + ), ), 'grouping' => array ( @@ -2193,6 +2301,10 @@ function activity_log_rules_defaults_fbsmp_insert_user_self() { array ( 'template' => '', ), + 'und' => + array ( + 'template' => '', + ), ), ), 'visibility' => @@ -2272,12 +2384,12 @@ function activity_log_rules_defaults_fbsmp_insert_user_self() { 0 => 'status', 1 => ':global', ), - 'templates|en|template' => + 'templates|und|template' => array ( 0 => 'status', 1 => ':global', ), - 'grouping|templates|en|template' => + 'grouping|templates|und|template' => array ( 0 => ':global', ), @@ -2289,8 +2401,8 @@ function activity_log_rules_defaults_fbsmp_insert_user_self() { 'visibility|stream_owner_id' => true, 'visibility|viewer_id' => true, 'acting_uid' => true, - 'templates|en|template' => true, - 'grouping|templates|en|template' => true, + 'templates|und|template' => true, + 'grouping|templates|und|template' => true, ), ), ), @@ -2307,8 +2419,8 @@ function activity_log_rules_defaults_fbsmp_insert_user_self() { 2 => 'visibility|stream_owner_id', 3 => 'visibility|viewer_id', 4 => 'acting_uid', - 5 => 'templates|en|template', - 6 => 'grouping|templates|en|template', + 5 => 'templates|und|template', + 6 => 'grouping|templates|und|template', ), ), '#weight' => 0, @@ -2328,8 +2440,8 @@ function activity_log_rules_defaults_fbsmp_insert_user_self() { 2 => 'visibility|stream_owner_id', 3 => 'visibility|viewer_id', 4 => 'acting_uid', - 5 => 'templates|en|template', - 6 => 'grouping|templates|en|template', + 5 => 'templates|und|template', + 6 => 'grouping|templates|und|template', ), ), '#name' => 'activity_log_log_action', @@ -2343,6 +2455,10 @@ function activity_log_rules_defaults_fbsmp_insert_user_self() { array ( 'template' => '[status:status-themed]', ), + 'und' => + array ( + 'template' => '[status:status-themed]', + ), ), 'grouping' => array ( @@ -2357,6 +2473,10 @@ function activity_log_rules_defaults_fbsmp_insert_user_self() { array ( 'template' => '', ), + 'und' => + array ( + 'template' => '', + ), ), ), 'visibility' => @@ -2436,12 +2556,12 @@ function activity_log_rules_defaults_fbsmp_insert_user_self() { 0 => 'status', 1 => ':global', ), - 'templates|en|template' => + 'templates|und|template' => array ( 0 => 'status', 1 => ':global', ), - 'grouping|templates|en|template' => + 'grouping|templates|und|template' => array ( 0 => ':global', ), @@ -2453,8 +2573,8 @@ function activity_log_rules_defaults_fbsmp_insert_user_self() { 'visibility|stream_owner_id' => true, 'visibility|viewer_id' => true, 'acting_uid' => true, - 'templates|en|template' => true, - 'grouping|templates|en|template' => true, + 'templates|und|template' => true, + 'grouping|templates|und|template' => true, ), ), ), @@ -2530,6 +2650,10 @@ function activity_log_rules_defaults_fbsmp_insert_other() { array ( 'template' => '[status:status-themed]', ), + 'und' => + array ( + 'template' => '[status:status-themed]', + ), ), 'grouping' => array ( @@ -2544,6 +2668,10 @@ function activity_log_rules_defaults_fbsmp_insert_other() { array ( 'template' => '', ), + 'und' => + array ( + 'template' => '', + ), ), ), 'visibility' => @@ -2629,12 +2757,12 @@ function activity_log_rules_defaults_fbsmp_insert_other() { 0 => 'status', 1 => ':global', ), - 'templates|en|template' => + 'templates|und|template' => array ( 0 => 'status', 1 => ':global', ), - 'grouping|templates|en|template' => + 'grouping|templates|und|template' => array ( 0 => ':global', ), @@ -2646,8 +2774,8 @@ function activity_log_rules_defaults_fbsmp_insert_other() { 'visibility|stream_owner_id' => true, 'visibility|viewer_id' => true, 'acting_uid' => true, - 'templates|en|template' => true, - 'grouping|templates|en|template' => true, + 'templates|und|template' => true, + 'grouping|templates|und|template' => true, ), ), ), @@ -2664,8 +2792,8 @@ function activity_log_rules_defaults_fbsmp_insert_other() { 2 => 'visibility|stream_owner_id', 3 => 'visibility|viewer_id', 4 => 'acting_uid', - 5 => 'templates|en|template', - 6 => 'grouping|templates|en|template', + 5 => 'templates|und|template', + 6 => 'grouping|templates|und|template', ), ), '#weight' => 0, @@ -2685,8 +2813,8 @@ function activity_log_rules_defaults_fbsmp_insert_other() { 2 => 'visibility|stream_owner_id', 3 => 'visibility|viewer_id', 4 => 'acting_uid', - 5 => 'templates|en|template', - 6 => 'grouping|templates|en|template', + 5 => 'templates|und|template', + 6 => 'grouping|templates|und|template', ), ), '#name' => 'activity_log_log_action', @@ -2701,6 +2829,11 @@ function activity_log_rules_defaults_fbsmp_insert_other() { 'template' => '
[status:sender-picture]
[status:sender-themed] sent a [attachment:attachment-type] to [status:recipient-link]
[status:created]
', ), + 'und' => + array ( + 'template' => '
[status:sender-picture]
[status:sender-themed] sent a [attachment:attachment-type] to [status:recipient-link]
+
[status:created]
', + ), ), 'grouping' => array ( @@ -2715,6 +2848,10 @@ function activity_log_rules_defaults_fbsmp_insert_other() { array ( 'template' => '', ), + 'und' => + array ( + 'template' => '', + ), ), ), 'visibility' => @@ -2794,13 +2931,13 @@ function activity_log_rules_defaults_fbsmp_insert_other() { 0 => 'status', 1 => ':global', ), - 'templates|en|template' => + 'templates|und|template' => array ( 0 => 'status', 1 => 'attachment', 2 => ':global', ), - 'grouping|templates|en|template' => + 'grouping|templates|und|template' => array ( 0 => ':global', ), @@ -2812,8 +2949,8 @@ function activity_log_rules_defaults_fbsmp_insert_other() { 'visibility|stream_owner_id' => true, 'visibility|viewer_id' => true, 'acting_uid' => true, - 'templates|en|template' => true, - 'grouping|templates|en|template' => true, + 'templates|und|template' => true, + 'grouping|templates|und|template' => true, ), ), ), @@ -2832,6 +2969,10 @@ function activity_log_rules_defaults_fbsmp_insert_other() { array ( 'template' => '[status:status-themed]', ), + 'und' => + array ( + 'template' => '[status:status-themed]', + ), ), 'grouping' => array ( @@ -2846,6 +2987,10 @@ function activity_log_rules_defaults_fbsmp_insert_other() { array ( 'template' => '', ), + 'und' => + array ( + 'template' => '', + ), ), ), 'visibility' => @@ -2929,12 +3074,12 @@ function activity_log_rules_defaults_fbsmp_insert_other() { array ( 0 => ':global', ), - 'templates|en|template' => + 'templates|und|template' => array ( 0 => 'status', 1 => ':global', ), - 'grouping|templates|en|template' => + 'grouping|templates|und|template' => array ( 0 => ':global', ), @@ -2946,8 +3091,8 @@ function activity_log_rules_defaults_fbsmp_insert_other() { 'visibility|stream_owner_id' => true, 'visibility|viewer_id' => true, 'acting_uid' => true, - 'templates|en|template' => true, - 'grouping|templates|en|template' => true, + 'templates|und|template' => true, + 'grouping|templates|und|template' => true, ), ), ), @@ -2964,8 +3109,8 @@ function activity_log_rules_defaults_fbsmp_insert_other() { 2 => 'visibility|stream_owner_id', 3 => 'visibility|viewer_id', 4 => 'acting_uid', - 5 => 'templates|en|template', - 6 => 'grouping|templates|en|template', + 5 => 'templates|und|template', + 6 => 'grouping|templates|und|template', ), ), '#weight' => 0, @@ -3012,6 +3157,10 @@ function activity_log_rules_defaults_og_join() { array ( 'template' => '
[account:picture]
[account:user] joined the group [group:title]
', ), + 'und' => + array ( + 'template' => '
[account:picture]
[account:user] joined the group [group:title]
', + ), ), 'grouping' => array ( @@ -3026,6 +3175,10 @@ function activity_log_rules_defaults_og_join() { array ( 'template' => '
[account:picture]
[account:user] joined the groups [collection]
', ), + 'und' => + array ( + 'template' => '
[account:picture]
[account:user] joined the groups [collection]
', + ), ), ), 'visibility' => @@ -3107,13 +3260,13 @@ function activity_log_rules_defaults_og_join() { 0 => 'account', 1 => ':global', ), - 'templates|en|template' => + 'templates|und|template' => array ( 0 => 'account', 1 => 'group', 2 => ':global', ), - 'grouping|templates|en|template' => + 'grouping|templates|und|template' => array ( 0 => 'account', 1 => ':global', @@ -3126,8 +3279,8 @@ function activity_log_rules_defaults_og_join() { 'visibility|stream_owner_id' => true, 'visibility|viewer_id' => true, 'acting_uid' => true, - 'templates|en|template' => true, - 'grouping|templates|en|template' => true, + 'templates|und|template' => true, + 'grouping|templates|und|template' => true, ), ), ), @@ -3144,8 +3297,8 @@ function activity_log_rules_defaults_og_join() { 2 => 'visibility|stream_owner_id', 3 => 'visibility|viewer_id', 4 => 'acting_uid', - 5 => 'templates|en|template', - 6 => 'grouping|templates|en|template', + 5 => 'templates|und|template', + 6 => 'grouping|templates|und|template', ), ), '#weight' => 0, @@ -3164,8 +3317,8 @@ function activity_log_rules_defaults_og_join() { 2 => 'visibility|stream_owner_id', 3 => 'visibility|viewer_id', 4 => 'acting_uid', - 5 => 'templates|en|template', - 6 => 'grouping|templates|en|template', + 5 => 'templates|und|template', + 6 => 'grouping|templates|und|template', ), ), '#name' => 'activity_log_log_action', @@ -3179,6 +3332,10 @@ function activity_log_rules_defaults_og_join() { array ( 'template' => '
[account:picture]
[account:user] joined the group [group:title]
', ), + 'und' => + array ( + 'template' => '
[account:picture]
[account:user] joined the group [group:title]
', + ), ), 'grouping' => array ( @@ -3193,6 +3350,10 @@ function activity_log_rules_defaults_og_join() { array ( 'template' => '
[account:picture]
[account:user] joined the groups [collection]
', ), + 'und' => + array ( + 'template' => '
[account:picture]
[account:user] joined the groups [collection]
', + ), ), ), 'visibility' => @@ -3274,13 +3435,13 @@ function activity_log_rules_defaults_og_join() { 0 => 'account', 1 => ':global', ), - 'templates|en|template' => + 'templates|und|template' => array ( 0 => 'account', 1 => 'group', 2 => ':global', ), - 'grouping|templates|en|template' => + 'grouping|templates|und|template' => array ( 0 => 'account', 1 => ':global', @@ -3293,8 +3454,8 @@ function activity_log_rules_defaults_og_join() { 'visibility|stream_owner_id' => true, 'visibility|viewer_id' => true, 'acting_uid' => true, - 'templates|en|template' => true, - 'grouping|templates|en|template' => true, + 'templates|und|template' => true, + 'grouping|templates|und|template' => true, ), ), ), @@ -3316,8 +3477,8 @@ function activity_log_rules_defaults_og_join() { 2 => 'visibility|stream_owner_id', 3 => 'visibility|viewer_id', 4 => 'acting_uid', - 5 => 'templates|en|template', - 6 => 'grouping|templates|en|template', + 5 => 'templates|und|template', + 6 => 'grouping|templates|und|template', ), ), '#name' => 'activity_log_log_action', @@ -3331,6 +3492,10 @@ function activity_log_rules_defaults_og_join() { array ( 'template' => '
[account:picture]
[account:user] joined the group
', ), + 'und' => + array ( + 'template' => '
[account:picture]
[account:user] joined the group
', + ), ), 'grouping' => array ( @@ -3345,6 +3510,10 @@ function activity_log_rules_defaults_og_join() { array ( 'template' => '
[names] joined the group
', ), + 'und' => + array ( + 'template' => '
[names] joined the group
', + ), ), ), 'visibility' => @@ -3424,12 +3593,12 @@ function activity_log_rules_defaults_og_join() { array ( 0 => ':global', ), - 'templates|en|template' => + 'templates|und|template' => array ( 0 => 'account', 1 => ':global', ), - 'grouping|templates|en|template' => + 'grouping|templates|und|template' => array ( 0 => ':global', ), @@ -3441,8 +3610,8 @@ function activity_log_rules_defaults_og_join() { 'visibility|stream_owner_id' => true, 'visibility|viewer_id' => true, 'acting_uid' => true, - 'templates|en|template' => true, - 'grouping|templates|en|template' => true, + 'templates|und|template' => true, + 'grouping|templates|und|template' => true, ), ), ), @@ -3490,6 +3659,10 @@ function activity_log_rules_defaults_ur_request() { array ( 'template' => '
[requester:user] [relationship:relationship-name]ed [requestee:user]
', ), + 'und' => + array ( + 'template' => '
[requester:user] [relationship:relationship-name]ed [requestee:user]
', + ), ), 'grouping' => array ( @@ -3504,6 +3677,10 @@ function activity_log_rules_defaults_ur_request() { array ( 'template' => '
[requester:user] [relationship:relationship-name]ed [collection]
', ), + 'und' => + array ( + 'template' => '
[requester:user] [relationship:relationship-name]ed [collection]
', + ), ), ), 'visibility' => @@ -3584,14 +3761,14 @@ function activity_log_rules_defaults_ur_request() { 0 => 'requester', 1 => ':global', ), - 'templates|en|template' => + 'templates|und|template' => array ( 0 => 'requester', 1 => 'requestee', 2 => 'relationship', 3 => ':global', ), - 'grouping|templates|en|template' => + 'grouping|templates|und|template' => array ( 0 => 'requester', 1 => 'relationship', @@ -3605,8 +3782,8 @@ function activity_log_rules_defaults_ur_request() { 'visibility|stream_owner_id' => true, 'visibility|viewer_id' => true, 'acting_uid' => true, - 'templates|en|template' => true, - 'grouping|templates|en|template' => true, + 'templates|und|template' => true, + 'grouping|templates|und|template' => true, ), ), ), @@ -3623,8 +3800,8 @@ function activity_log_rules_defaults_ur_request() { 2 => 'visibility|stream_owner_id', 3 => 'visibility|viewer_id', 4 => 'acting_uid', - 5 => 'templates|en|template', - 6 => 'grouping|templates|en|template', + 5 => 'templates|und|template', + 6 => 'grouping|templates|und|template', ), ), '#weight' => 0, @@ -3644,8 +3821,8 @@ function activity_log_rules_defaults_ur_request() { 2 => 'visibility|stream_owner_id', 3 => 'visibility|viewer_id', 4 => 'acting_uid', - 5 => 'templates|en|template', - 6 => 'grouping|templates|en|template', + 5 => 'templates|und|template', + 6 => 'grouping|templates|und|template', ), ), '#name' => 'activity_log_log_action', @@ -3659,6 +3836,10 @@ function activity_log_rules_defaults_ur_request() { array ( 'template' => '
[requester:user] [relationship:relationship-name]ed [requestee:user]
', ), + 'und' => + array ( + 'template' => '
[requester:user] [relationship:relationship-name]ed [requestee:user]
', + ), ), 'grouping' => array ( @@ -3673,6 +3854,10 @@ function activity_log_rules_defaults_ur_request() { array ( 'template' => '
[requester:user] [relationship:relationship-name]ed [collection]
', ), + 'und' => + array ( + 'template' => '
[requester:user] [relationship:relationship-name]ed [collection]
', + ), ), ), 'visibility' => @@ -3753,14 +3938,14 @@ function activity_log_rules_defaults_ur_request() { 0 => 'requester', 1 => ':global', ), - 'templates|en|template' => + 'templates|und|template' => array ( 0 => 'requester', 1 => 'requestee', 2 => 'relationship', 3 => ':global', ), - 'grouping|templates|en|template' => + 'grouping|templates|und|template' => array ( 0 => 'requester', 1 => 'relationship', @@ -3774,8 +3959,8 @@ function activity_log_rules_defaults_ur_request() { 'visibility|stream_owner_id' => true, 'visibility|viewer_id' => true, 'acting_uid' => true, - 'templates|en|template' => true, - 'grouping|templates|en|template' => true, + 'templates|und|template' => true, + 'grouping|templates|und|template' => true, ), ), ), diff --git a/activity_log.theme.inc b/activity_log.theme.inc index 60cfc96..4a25410 100644 --- a/activity_log.theme.inc +++ b/activity_log.theme.inc @@ -22,7 +22,7 @@ function theme_activity_log_item($record, $reset = FALSE) { static $user_lang; if (!isset($user_lang)) { - $user_lang = user_preferred_language($GLOBALS['user'])->language; + $user_lang = $GLOBALS['language']->language; } if ($reset || empty($record->cacheable) || empty($record->cached) || empty($record->cached[$user_lang])) { if (empty($record->template)) { @@ -170,8 +170,22 @@ function activity_log_collapse_list_vertical($collection, $count) { function activity_log_evaluate_record($record) { $time = time(); rules_include('rules'); - //$user_lang = user_preferred_language($GLOBALS['user'])->language; - $default_lang = 'en';//language_default('language'); + // Evaluate the language we want. + // Try the current page language, the site default language, then English. + $record->template['und'] = t('No translation found!'); + $record->group_template['und'] = t('No translation found!'); + foreach(array($GLOBALS['language']->language, language_default('language'), 'en') as $langcode) { + if (!empty($record->template[$langcode])) { + $record->template['und'] = $record->template[$langcode]; + break; + } + } + foreach(array($GLOBALS['language']->language, language_default('language'), 'en') as $langcode) { + if (!empty($record->group_template[$langcode])) { + $record->group_template['und'] = $record->group_template[$langcode]; + break; + } + } // Get the stored data we need to apply the Rules input evaluators. $master_element = array('#settings' => array( 'placeholder' => '', @@ -200,21 +214,13 @@ function activity_log_evaluate_record($record) { foreach ($state['variables'] as $type => $info) { $info->data->_data = activity_log_get_variable($type, $event->id_map); } - if (module_exists('i18nstrings')) { - $element['#settings']['templates'][$default_lang]['template'] = - i18nstrings('activity_log:template:'. $record->tid, $element['#settings']['templates'][$default_lang]['template']); - $element['#settings']['grouping']['templates'][$default_lang]['template'] = - i18nstrings('activity_log:group_template:'. $record->tid, $element['#settings']['grouping']['templates'][$default_lang]['template']); - } // Apply the Rules input evaluators. rules_apply_input_evaluators($element, $state); // Keep track of the evaluated templates. $templates = $element['#settings']['templates']; - //$template = empty($templates[$user_lang]['template']) ? $templates[$default_lang]['template'] : $templates[$user_lang]['template']; - $template = $templates[$default_lang]['template']; + $template = $templates['und']['template']; $group_templates = $element['#settings']['grouping']['templates']; - //$group_template = empty($group_templates[$user_lang]['template']) ? $group_templates[$default_lang]['template'] : $group_templates[$user_lang]['template']; - $group_template = $group_templates[$default_lang]['template']; + $group_template = $group_templates['und']['template']; // Compute the group template variables. if (strpos($group_template, '[names]') !== FALSE) { $acting_user = activity_log_user_load($event->acting_uid);