Index: themesettings.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/themesettings/themesettings.module,v
retrieving revision 1.10.2.2
diff -u -p -r1.10.2.2 themesettings.module
--- themesettings.module	10 Jul 2007 05:47:53 -0000	1.10.2.2
+++ themesettings.module	10 Jul 2007 06:22:48 -0000
@@ -52,11 +52,11 @@ function themesettings_nodeapi(&$node, $
       // Create the link
       if (isset($rss_teaser) or $teaser and $node->readmore and $settings["ts_{$node->type}_readmore_placement"] != 'links') {
         $link = _themesettings_link(
-                  $settings["ts_{$node->type}_readmore_prefix"],
-                  $settings["ts_{$node->type}_readmore_suffix"],
-                  $settings["ts_{$node->type}_readmore"],
+                  t($settings["ts_{$node->type}_readmore_prefix"]),
+                  t($settings["ts_{$node->type}_readmore_suffix"]),
+                  t($settings["ts_{$node->type}_readmore"]),
                   "node/$node->nid",
-                  array('title' => $settings["ts_{$node->type}_readmore_title"]),
+                  array('title' => t($settings["ts_{$node->type}_readmore_title"])),
                   NULL,
                   NULL,
                   ($op == 'rss item')  // Use an absolute link if it's an RSS item.
@@ -70,28 +70,28 @@ function themesettings_nodeapi(&$node, $
         $all = comment_num_all($node->nid);
         if ($all) {
           $comment_link = _themesettings_link(
-                            $settings["ts_{$node->type}_comment_prefix"],
-                            $settings["ts_{$node->type}_comment_suffix"],
+                            t($settings["ts_{$node->type}_comment_prefix"]),
+                            t($settings["ts_{$node->type}_comment_suffix"]),
                             format_plural($all,
                                           $settings["ts_{$node->type}_comment_singular"],
                                           $settings["ts_{$node->type}_comment_plural"]
                                          ),
                             "node/$node->nid",
-                            array('title' => $settings["ts_{$node->type}_comment_title"]),
+                            array('title' => t($settings["ts_{$node->type}_comment_title"])),
                             NULL,
                             'comments'
                           );
           $new = comment_num_new($node->nid);
           if ($new) {
             $comment_link .= _themesettings_link(
-                               $settings["ts_{$node->type}_comment_new_prefix"],
-                               $settings["ts_{$node->type}_comment_new_suffix"],
+                               t($settings["ts_{$node->type}_comment_new_prefix"]),
+                               t($settings["ts_{$node->type}_comment_new_suffix"]),
                                format_plural($new,
                                              $settings["ts_{$node->type}_comment_new_singular"],
                                              $settings["ts_{$node->type}_comment_new_plural"]
                                             ),
                                "node/$node->nid",
-                               array('title' => $settings["ts_{$node->type}_comment_new_title"]),
+                               array('title' => t($settings["ts_{$node->type}_comment_new_title"])),
                                NULL,
                                'new'
                              );
@@ -99,11 +99,11 @@ function themesettings_nodeapi(&$node, $
         }
         elseif (!$settings["ts_{$node->type}_comment_add_disable"]) {
           $comment_link = _themesettings_link(
-                            $settings["ts_{$node->type}_comment_add_prefix"],
-                            $settings["ts_{$node->type}_comment_add_suffix"],
-                            $settings["ts_{$node->type}_comment_add"],
+                            t($settings["ts_{$node->type}_comment_add_prefix"]),
+                            t($settings["ts_{$node->type}_comment_add_suffix"]),
+                            t($settings["ts_{$node->type}_comment_add"]),
                             "comment/reply/$node->nid",
-                            array('title' => $settings["ts_{$node->type}_comment_add_title"]),
+                            array('title' => t($settings["ts_{$node->type}_comment_add_title"])),
                             NULL,
                             'comment-form'
                           );
@@ -179,11 +179,11 @@ function themesettings_link_alter(&$node
   if (isset($links['node_read_more'])) {
     $links['node_read_more'] = array(
       'title' => _themesettings_link(
-                   $settings["ts_{$node->type}_readmore_prefix"],
-                   $settings["ts_{$node->type}_readmore_suffix"],
-                   $settings["ts_{$node->type}_readmore"],
+                   t($settings["ts_{$node->type}_readmore_prefix"]),
+                   t($settings["ts_{$node->type}_readmore_suffix"]),
+                   t($settings["ts_{$node->type}_readmore"]),
                    "node/$node->nid",
-                   array('title' => $settings["ts_{$node->type}_readmore_title"])
+                   array('title' => t($settings["ts_{$node->type}_readmore_title"]))
                  ),
       'html' => TRUE,
     );
@@ -194,14 +194,14 @@ function themesettings_link_alter(&$node
     $all = comment_num_all($node->nid);
     $links['comment_comments'] = array(
       'title' => _themesettings_link(
-                   $settings["ts_{$node->type}_comment_prefix"],
-                   $settings["ts_{$node->type}_comment_suffix"],
+                   t($settings["ts_{$node->type}_comment_prefix"]),
+                   t($settings["ts_{$node->type}_comment_suffix"]),
                    format_plural($all,
                                  $settings["ts_{$node->type}_comment_singular"],
                                  $settings["ts_{$node->type}_comment_plural"]
                                 ),
                    "node/$node->nid",
-                   array('title' => $settings["ts_{$node->type}_comment_title"]),
+                   array('title' => t($settings["ts_{$node->type}_comment_title"])),
                    NULL,
                    'comments'
                  ),
@@ -212,14 +212,14 @@ function themesettings_link_alter(&$node
     $new = comment_num_new($node->nid);
     $links['comment_new_comments'] = array(
       'title' => _themesettings_link(
-                   $settings["ts_{$node->type}_comment_new_prefix"],
-                   $settings["ts_{$node->type}_comment_new_suffix"],
+                   t($settings["ts_{$node->type}_comment_new_prefix"]),
+                   t($settings["ts_{$node->type}_comment_new_suffix"]),
                    format_plural($new,
                                  $settings["ts_{$node->type}_comment_new_singular"],
                                  $settings["ts_{$node->type}_comment_new_plural"]
                                 ),
                    "node/$node->nid",
-                   array('title' => $settings["ts_{$node->type}_comment_new_title"]),
+                   array('title' => t($settings["ts_{$node->type}_comment_new_title"])),
                    NULL,
                    'new'
                  ),
@@ -230,11 +230,11 @@ function themesettings_link_alter(&$node
     if ($node->display_teaser) {
       $links['comment_add'] = array(
         'title' => _themesettings_link(
-                     $settings["ts_{$node->type}_comment_add_prefix"],
-                     $settings["ts_{$node->type}_comment_add_suffix"],
-                     $settings["ts_{$node->type}_comment_add"],
+                     t($settings["ts_{$node->type}_comment_add_prefix"]),
+                     t($settings["ts_{$node->type}_comment_add_suffix"]),
+                     t($settings["ts_{$node->type}_comment_add"]),
                      "comment/reply/$node->nid",
-                     array('title' => $settings["ts_{$node->type}_comment_add_title"]),
+                     array('title' => t($settings["ts_{$node->type}_comment_add_title"])),
                      NULL,
                      'comment-form'
                    ),
@@ -244,11 +244,11 @@ function themesettings_link_alter(&$node
     else {
       $links['comment_add'] = array(
         'title' => _themesettings_link(
-                     $settings["ts_{$node->type}_comment_node_prefix"],
-                     $settings["ts_{$node->type}_comment_node_suffix"],
-                     $settings["ts_{$node->type}_comment_node"],
+                     t($settings["ts_{$node->type}_comment_node_prefix"]),
+                     t($settings["ts_{$node->type}_comment_node_suffix"]),
+                     t($settings["ts_{$node->type}_comment_node"]),
                      "comment/reply/$node->nid",
-                     array('title' => $settings["ts_{$node->type}_comment_node_title"]),
+                     array('title' => t($settings["ts_{$node->type}_comment_node_title"])),
                      NULL,
                      'comment-form'
                    ),
@@ -612,30 +612,30 @@ function _themesettings_get_settings($va
     // Set the default content-type settings
     $defaults = array(
       'ts_readmore_enable_content_type'     => 0,
-      'ts_default_readmore'                 => t('Read more'),
-      'ts_default_readmore_title'           => t('Read the rest of this posting.'),
+      'ts_default_readmore'                 => 'Read more',
+      'ts_default_readmore_title'           => 'Read the rest of this posting.',
       'ts_default_readmore_prefix'          => '',
       'ts_default_readmore_suffix'          => '',
       'ts_default_readmore_placement'       => 'links',
       'ts_comment_enable_content_type'      => 0,
-      'ts_default_comment_singular'         => t('1 comment'),
-      'ts_default_comment_plural'           => t('@count comments'),
-      'ts_default_comment_title'            => t('Jump to the first comment of this posting.'),
+      'ts_default_comment_singular'         => '1 comment',
+      'ts_default_comment_plural'           => '@count comments',
+      'ts_default_comment_title'            => 'Jump to the first comment of this posting.',
       'ts_default_comment_prefix'           => '',
       'ts_default_comment_suffix'           => '',
-      'ts_default_comment_new_singular'     => t('1 new comment'),
-      'ts_default_comment_new_plural'       => t('@count new comments'),
-      'ts_default_comment_new_title'        => t('Jump to the first new comment of this posting.'),
+      'ts_default_comment_new_singular'     => '1 new comment',
+      'ts_default_comment_new_plural'       => '@count new comments',
+      'ts_default_comment_new_title'        => 'Jump to the first new comment of this posting.',
       'ts_default_comment_new_prefix'       => '',
       'ts_default_comment_new_suffix'       => '',
-      'ts_default_comment_add'              => t('Add new comment'),
-      'ts_default_comment_add_title'        => t('Add a new comment to this page.'),
+      'ts_default_comment_add'              => 'Add new comment',
+      'ts_default_comment_add_title'        => 'Add a new comment to this page.',
       'ts_default_comment_add_prefix'       => '',
       'ts_default_comment_add_suffix'       => '',
       'ts_default_comment_add_disable'      => 0,
       'ts_default_comment_teaser_placement' => 'links',
-      'ts_default_comment_node'             => t('Add new comment'),
-      'ts_default_comment_node_title'       => t('Share your thoughts and opinions related to this posting.'),
+      'ts_default_comment_node'             => 'Add new comment',
+      'ts_default_comment_node_title'       => 'Share your thoughts and opinions related to this posting.',
       'ts_default_comment_node_prefix'      => '',
       'ts_default_comment_node_suffix'      => '',
     );