diff --git a/includes/simplenews.source.inc b/includes/simplenews.source.inc index ae2eee0..5b695c3 100644 --- a/includes/simplenews.source.inc +++ b/includes/simplenews.source.inc @@ -577,7 +577,10 @@ class SimplenewsSourceNode implements SimplenewsSourceNodeInterface { */ function getSubject() { // Build email subject and perform some sanitizing. - $subject = token_replace($this->getCategory()->email_subject, $this->getTokenContext(), array('sanitize' => FALSE)); + $langcode = $this->getLanguage(); + $language_list = language_list(); + $language = $language_list[$langcode]; + $subject = token_replace($this->getCategory()->email_subject, $this->getTokenContext(), array('sanitize' => FALSE, 'language' => $language)); // Line breaks are removed from the email subject to prevent injection of // malicious data into the email header. @@ -586,20 +589,40 @@ class SimplenewsSourceNode implements SimplenewsSourceNodeInterface { } /** - * Overwrites the current content language for i18n_select. + * Set up the necessary language and user context. */ - protected function setContentLanguage($language) { + protected function setContext() { + + // Switch to the user + if ($this->uid = $this->getSubscriber()->uid) { + simplenews_impersonate_user($this->uid); + } + + // Change language. + $language = $this->getLanguage(); + $this->original_language = $GLOBALS['language']; + $languages = language_list(); + $GLOBALS['language'] = $languages[$language]; + $GLOBALS['language_url'] = $languages[$language]; + // Overwrites the current content language for i18n_select. if (module_exists('i18n_select')) { - $this->original_language = $GLOBALS['language_content']; - $languages = language_list(); $GLOBALS['language_content'] = $languages[$language]; } } /** - * Reset the content language back to the previous value. + * Reset the context. */ - protected function resetContentLanguage() { + protected function resetContext() { + + // Switch back to the previous user. + if ($this->uid) { + simplenews_revert_user(); + } + + // Switch language back. + $GLOBALS['language'] = $this->original_language; + $GLOBALS['language_url'] = $this->original_language; if (module_exists('i18n_select')) { $GLOBALS['language_content'] = $this->original_language; } @@ -620,11 +643,6 @@ class SimplenewsSourceNode implements SimplenewsSourceNodeInterface { return $this->build[$format]; } - // Set the active language to the node's language. - // This needs to be done as otherwise the language used to send the mail - // is the language of the user logged in. - $this->setContentLanguage($this->node->language); - // Build message body // Supported view modes: 'email_plain', 'email_html', 'email_textalt' $build = node_view($this->node, 'email_' . $format); @@ -636,8 +654,6 @@ class SimplenewsSourceNode implements SimplenewsSourceNodeInterface { } } - $this->resetContentLanguage(); - $this->build[$format] = $build; return $this->build[$format]; } @@ -684,10 +700,8 @@ class SimplenewsSourceNode implements SimplenewsSourceNodeInterface { * The rendered mail body as a string. */ protected function getBodyWithFormat($format) { - // Impersonate the subscriber if he is a user. - if ($uid = $this->getSubscriber()->uid) { - simplenews_impersonate_user($uid); - } + // Switch to correct user and language context. + $this->setContext(); if ($cache = $this->cache->get('final', 'body:' . $format)) { return $cache; @@ -702,11 +716,7 @@ class SimplenewsSourceNode implements SimplenewsSourceNodeInterface { $body = simplenews_html_to_text($body, $this->getCategory()->hyperlinks); } $this->cache->set('final', 'body:' . $format, $body); - - // Switch back to the previous user. - if ($uid) { - simplenews_revert_user(); - } + $this->resetContext(); return $body; } @@ -763,11 +773,14 @@ class SimplenewsSourceNode implements SimplenewsSourceNodeInterface { * The footer for the requested format. */ protected function getFooterWithFormat($format) { + // Switch to correct user and language context. + $this->setContext(); if ($cache = $this->cache->get('final', 'footer:' . $format)) { return $cache; } $final_footer = token_replace($this->buildFooter($format), $this->getTokenContext(), array('sanitize' => FALSE)); $this->cache->set('build', 'footer:' . $format, $final_footer); + $this->resetContext(); return $final_footer; } diff --git a/simplenews.module b/simplenews.module index bdd96c0..ae9de25 100644 --- a/simplenews.module +++ b/simplenews.module @@ -2045,6 +2045,13 @@ function simplenews_token_info() { function simplenews_tokens($type, $tokens, $data = array(), $options = array()) { $replacements = array(); $sanitize = !empty($options['sanitize']); + if (isset($options['language'])) { + $url_options['language'] = $options['language']; + $language_code = $options['language']->language; + } + else { + $language_code = NULL; + } switch ($type) { case 'simplenews-subscriber': @@ -2093,7 +2100,7 @@ function simplenews_tokens($type, $tokens, $data = array(), $options = array()) switch ($name) { case 'name': if (isset($category->name)) { - $newsletter_name = _simplenews_newsletter_name($category); + $newsletter_name = _simplenews_newsletter_name($category, $language_code); $replacements[$original] = $sanitize ? check_plain($newsletter_name) : $newsletter_name; } else { diff --git a/tests/simplenews.test b/tests/simplenews.test index a202414..01d30e5 100644 --- a/tests/simplenews.test +++ b/tests/simplenews.test @@ -1092,8 +1092,8 @@ class SimpleNewsI18nTestCase extends SimplenewsTestCase { } function setUp() { - parent::setUp(array('locale', 'i18n', 'variable', 'i18n_string', 'i18n_translation', 'i18n_taxonomy')); - $this->admin_user = $this->drupalCreateUser(array('bypass node access', 'administer nodes', 'administer languages', 'administer content types', 'administer blocks', 'access administration pages', 'administer filters', 'administer taxonomy', 'translate interface', 'subscribe to newsletters', 'administer site configuration')); + parent::setUp(array('locale', 'i18n', 'variable', 'i18n_string', 'i18n_taxonomy', 'translation', 'i18n_translation')); + $this->admin_user = $this->drupalCreateUser(array('bypass node access', 'administer nodes', 'administer languages', 'administer content types', 'administer blocks', 'access administration pages', 'administer filters', 'administer taxonomy', 'translate interface', 'subscribe to newsletters', 'administer site configuration', 'translate content', 'administer simplenews subscriptions', 'send newsletter')); $this->drupalLogin($this->admin_user); $this->setUpLanguages(); } @@ -1138,7 +1138,7 @@ class SimpleNewsI18nTestCase extends SimplenewsTestCase { } } - function testCategoryTranslation() { + function dtestCategoryTranslation() { $this->drupalLogin($this->admin_user); // Make Input Format "Filtered Text" translatable $edit = array( @@ -1176,6 +1176,102 @@ class SimpleNewsI18nTestCase extends SimplenewsTestCase { $this->assertText($es_name, t('Category name is translated.')); } + function testContentTranslation() { + // Sign up two users, one in english, another in spanish. + $english_mail = $this->randomEmail(); + $spanish_mail = $this->randomEmail(); + $tid = $this->getRandomNewsletter(); + + simplenews_subscribe_user($english_mail, $tid, FALSE, 'english', 'en'); + simplenews_subscribe_user($spanish_mail, $tid, FALSE, 'spanish', 'es'); + + // Translate category. + $vocabulary = taxonomy_vocabulary_load(variable_get('simplenews_vid', 0)); + $vocabulary->i18n_mode = I18N_MODE_LOCALIZE; + taxonomy_vocabulary_save($vocabulary); + drupal_static_reset('i18n_taxonomy_vocabulary_mode'); + + // Refresh strings. + // @todo: simplenews_category_save() should probably take care of this. + // Currently done separately in simplenews_admin_category_form_submit() + // for the admin UI. + $tid = $this->getRandomNewsletter(); + $term = taxonomy_term_load($tid); + taxonomy_term_save($term); + + // Translate term to spanish. + list($textgroup, $context) = i18n_string_context(array('taxonomy', 'term', $tid, 'name')); + i18n_string_textgroup($textgroup)->update_translation($context, 'es', $es_name = $this->randomName()); + + // Enable translation for newsletters. + $edit = array( + 'language_content_type' => TRANSLATION_ENABLED, + ); + $this->drupalPost('admin/structure/types/manage/simplenews', $edit, t('Save content type')); + + // Create a Newsletter including a translation. + $english = array( + 'title' => $this->randomName(), + 'language' => 'en', + 'body[und][0][value]' => 'Link to node: [node:url]', + ); + $this->drupalPost('node/add/simplenews', $english, ('Save')); + $this->assertTrue(preg_match('|node/(\d+)$|', $this->getUrl(), $matches), 'Node created'); + $english_node = node_load($matches[1]); + + $this->clickLink(t('Translate')); + $this->clickLink(t('add translation')); + $spanish = array( + 'title' => $this->randomName(), + ); + $this->drupalPost(NULL, $spanish, ('Save')); + $this->assertTrue(preg_match('|node/(\d+)$|', $this->getUrl(), $matches), 'Node created'); + $spanish_node = node_load($matches[1]); + + entity_get_controller('node')->resetCache(); + $english_node = node_load($english_node->nid); + + // Verify redirecation to source. + $this->clickLink(t('Newsletter')); + $this->assertText(t('This newsletter issue is part of a translation set. Sending this set is controlled from the translation source newsletter.')); + + $this->clickLink(t('translation source newsletter')); + $this->assertText($english_node->title); + + // Send newsletter. + $this->clickLink(t('Newsletter')); + $edit = array( + 'simplenews[send]' => SIMPLENEWS_COMMAND_SEND_NOW, + ); + $this->drupalPost(NULL, $edit, t('Submit')); + simplenews_cron(); + + $this->assertEqual(2, count($this->drupalGetMails())); + + $category = simplenews_category_load($this->getRandomNewsletter()); + + $languages = language_list(); + foreach ($this->drupalGetMails() as $mail) { + + if ($mail['to'] == $english_mail) { + $this->assertEqual('en', $mail['language']); + $this->assertEqual('[' . $category->name . '] ' . $english_node->title, $mail['subject']); + $node_url = url('node/' . $english_node->nid, array('language' => $languages['en'], 'absolute' => TRUE)); + } + elseif ($mail['to'] == $spanish_mail) { + $this->assertEqual('es', $mail['language']); + $this->assertEqual('[' . $es_name . '] ' . $spanish_node->title, $mail['subject']); + $node_url = url('node/' . $spanish_node->nid, array('language' => $languages['es'], 'absolute' => TRUE)); + } + else { + $this->fail(t('Mail not sent to expected recipient')); + } + + // Verify that the link is in the correct language. + $this->assertTrue(strpos($mail['body'], $node_url) !== FALSE); + } + } + /** * Set up configuration for multiple languages. *