- Fixed translation bugs (reported by Alexander Schwartz)

10 files changed, 22 insertions, 14 deletions

diff --git a/modules/aggregator.module b/modules/aggregator.module
index 98228f8ca..55f321f9e 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -240,7 +240,7 @@ function import_form_bundle($edit = array()) {
   $form .= form_submit("Submit");
 
   if ($edit[bid]) {
-    $form .= form_submit(t("Delete"));
+    $form .= form_submit("Delete");
     $form .= form_hidden("bid", $edit[bid]);
   }
 
@@ -278,7 +278,7 @@ function import_form_feed($edit = array()) {
   $form .= form_submit("Submit");
 
   if ($edit[fid]) {
-    $form .= form_submit(t("Delete"));
+    $form .= form_submit("Delete");
     $form .= form_hidden("fid", $edit[fid]);
   }
 
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index 98228f8ca..55f321f9e 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -240,7 +240,7 @@ function import_form_bundle($edit = array()) {
   $form .= form_submit("Submit");
 
   if ($edit[bid]) {
-    $form .= form_submit(t("Delete"));
+    $form .= form_submit("Delete");
     $form .= form_hidden("bid", $edit[bid]);
   }
 
@@ -278,7 +278,7 @@ function import_form_feed($edit = array()) {
   $form .= form_submit("Submit");
 
   if ($edit[fid]) {
-    $form .= form_submit(t("Delete"));
+    $form .= form_submit("Delete");
     $form .= form_hidden("fid", $edit[fid]);
   }
 
diff --git a/modules/blog.module b/modules/blog.module
index eeee99f8d..df53e2b49 100644
--- a/modules/blog.module
+++ b/modules/blog.module
@@ -100,7 +100,7 @@ function blog_page_user($uid = 0, $date = 0) {
       $output .= "<tr><td colspan=\"2\"><b><a href=\"module.php?mod=blog&id=$blog->uid&date=". mktime(23, 59, 59, date("n", $blog->timestamp), date("d", $blog->timestamp), date("Y", $blog->timestamp)) ."\">". format_date($blog->timestamp, custom, "d M Y") .":</a></b></td></tr>";
     }
 
-    if ($user->uid && $user->name == $name) {
+    if ($user->uid && $user->uid == $uid) {
       $links[] = "<a href=\"submit.php?mod=blog&op=edit&id=$blog->nid\">". t("edit") ."</a>";
     }
 
diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index eeee99f8d..df53e2b49 100644
--- a/modules/blog/blog.module
+++ b/modules/blog/blog.module
@@ -100,7 +100,7 @@ function blog_page_user($uid = 0, $date = 0) {
       $output .= "<tr><td colspan=\"2\"><b><a href=\"module.php?mod=blog&id=$blog->uid&date=". mktime(23, 59, 59, date("n", $blog->timestamp), date("d", $blog->timestamp), date("Y", $blog->timestamp)) ."\">". format_date($blog->timestamp, custom, "d M Y") .":</a></b></td></tr>";
     }
 
-    if ($user->uid && $user->name == $name) {
+    if ($user->uid && $user->uid == $uid) {
       $links[] = "<a href=\"submit.php?mod=blog&op=edit&id=$blog->nid\">". t("edit") ."</a>";
     }
 
diff --git a/modules/import.module b/modules/import.module
index 98228f8ca..55f321f9e 100644
--- a/modules/import.module
+++ b/modules/import.module
@@ -240,7 +240,7 @@ function import_form_bundle($edit = array()) {
   $form .= form_submit("Submit");
 
   if ($edit[bid]) {
-    $form .= form_submit(t("Delete"));
+    $form .= form_submit("Delete");
     $form .= form_hidden("bid", $edit[bid]);
   }
 
@@ -278,7 +278,7 @@ function import_form_feed($edit = array()) {
   $form .= form_submit("Submit");
 
   if ($edit[fid]) {
-    $form .= form_submit(t("Delete"));
+    $form .= form_submit("Delete");
     $form .= form_hidden("fid", $edit[fid]);
   }
 
diff --git a/modules/meta.module b/modules/meta.module
index 32ef449c9..c80c1e462 100644
--- a/modules/meta.module
+++ b/modules/meta.module
@@ -67,7 +67,7 @@ function meta_form_collection($edit = array()) {
   $form .= form_submit("Submit");
 
   if ($edit[cid]) {
-    $form .= form_submit(t("Delete"));
+    $form .= form_submit("Delete");
     $form .= form_hidden("cid", $edit[cid]);
   }
 
@@ -83,7 +83,7 @@ function meta_form_tag($edit = array()) {
   $form .= form_submit("Submit");
 
   if ($edit[tid]) {
-    $form .= form_submit(t("Delete"));
+    $form .= form_submit("Delete");
     $form .= form_hidden("tid", $edit[tid]);
   }
 
diff --git a/modules/node.module b/modules/node.module
index 74160311d..428f3c4ba 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -3,6 +3,10 @@
 class Node {
   function Node($node) {
     global $user;
+    $this->uid = $node[uid] ? $node[uid] : $user->uid;
+    $this->nid = $node[nid];
+    $this->type = $node[type];
+    $this->comment = $node[comment] ? $node[comment] :
     $this->name = $node[name] ? $node[name] : $user->name;
     $this->title = $node[title];
     $this->attributes = $node[attributes];
diff --git a/modules/node/node.module b/modules/node/node.module
index 74160311d..428f3c4ba 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -3,6 +3,10 @@
 class Node {
   function Node($node) {
     global $user;
+    $this->uid = $node[uid] ? $node[uid] : $user->uid;
+    $this->nid = $node[nid];
+    $this->type = $node[type];
+    $this->comment = $node[comment] ? $node[comment] :
     $this->name = $node[name] ? $node[name] : $user->name;
     $this->title = $node[title];
     $this->attributes = $node[attributes];
diff --git a/modules/search.module b/modules/search.module
index 86049d67d..afe827b2e 100644
--- a/modules/search.module
+++ b/modules/search.module
@@ -17,7 +17,7 @@ function search_item($item, $type) {
   $output .= " <b><u><a href=\"". $item["link"] ."\">". $item["title"] ."</a></u></b><br />";
   $output .= " <small>$type ". ($item["user"] ? " - ". $item["user"] : "") ."". ($item["date"] ? " - ". format_date($item["date"], "small") : "") ."</small>";
   $output .= "</p>";
-  
+
   return $output;
 }
 
@@ -70,7 +70,7 @@ function search_page() {
     /*
     ** Display form and search results:
     */
-    
+
     $theme->header();
 
     if ($form) {
diff --git a/modules/search/search.module b/modules/search/search.module
index 86049d67d..afe827b2e 100644
--- a/modules/search/search.module
+++ b/modules/search/search.module
@@ -17,7 +17,7 @@ function search_item($item, $type) {
   $output .= " <b><u><a href=\"". $item["link"] ."\">". $item["title"] ."</a></u></b><br />";
   $output .= " <small>$type ". ($item["user"] ? " - ". $item["user"] : "") ."". ($item["date"] ? " - ". format_date($item["date"], "small") : "") ."</small>";
   $output .= "</p>";
-  
+
   return $output;
 }
 
@@ -70,7 +70,7 @@ function search_page() {
     /*
     ** Display form and search results:
     */
-    
+
     $theme->header();
 
     if ($form) {