From d2c532f1f41ca5a85e6b79c6417aae2cd728fdeb Mon Sep 17 00:00:00 2001
From: kevin_fourie <kevin_fourie@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Thu, 11 Jan 2007 15:07:58 +0000
Subject: [PATCH] KTS-1482 "Can't translate notifications" Fixed. Updated smarty templates as per patch provided by Nicolas Quienot.

---
 templates/kt3/notifications/subscriptions.AddDocument.smarty              | 3 +--
 templates/kt3/notifications/subscriptions.AddFolder.smarty                | 3 +--
 templates/kt3/notifications/subscriptions.ArchivedDocument.smarty         | 4 +---
 templates/kt3/notifications/subscriptions.CheckInDocument.smarty          | 3 +--
 templates/kt3/notifications/subscriptions.CheckOutDocument.smarty         | 3 +--
 templates/kt3/notifications/subscriptions.ModifyDocument.smarty           | 3 +--
 templates/kt3/notifications/subscriptions.MoveDocument.smarty             | 3 +--
 templates/kt3/notifications/subscriptions.RemoveChildDocument.smarty      | 4 +---
 templates/kt3/notifications/subscriptions.RemoveChildFolder.smarty        | 3 +--
 templates/kt3/notifications/subscriptions.RemoveSubscribedDocument.smarty | 3 +--
 templates/kt3/notifications/subscriptions.RemoveSubscribedFolder.smarty   | 3 +--
 templates/kt3/notifications/subscriptions.RestoreDocument.smarty          | 2 +-
 12 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/templates/kt3/notifications/subscriptions.AddDocument.smarty b/templates/kt3/notifications/subscriptions.AddDocument.smarty
index adf25aa..7046602 100644
--- a/templates/kt3/notifications/subscriptions.AddDocument.smarty
+++ b/templates/kt3/notifications/subscriptions.AddDocument.smarty
@@ -1,8 +1,7 @@
 <dt class="actionitem subscription">{$info.title}</dt>
 <dd class="actionmessage">
 <!-- could break this up. -->
-    The document "{$info.object_name}" was added{if ($info.location_name !== null)} to "{$info.location_name}"{/if}{if ($info.has_actor)} 
-	by {$info.actor_name}{/if}.
+    {i18n arg_object_name=$info.object_name}The document "#object_name#" was added{/i18n}{if ($info.location_name !== null)} {i18n arg_location_name=$info.location_name}to "#location_name#"{/i18n}{/if}{if ($info.has_actor)} {i18n arg_actor_name=$info.actor_name}by #actor_name#{/i18n}{/if}.
     <div class="actionoptions">
         {if !$is_broken}
         <a href="{ktLink base="notify.php" query="id=`$info.notify_id`"}">{i18n}View Document{/i18n}</a>
diff --git a/templates/kt3/notifications/subscriptions.AddFolder.smarty b/templates/kt3/notifications/subscriptions.AddFolder.smarty
index 2030144..63dd165 100644
--- a/templates/kt3/notifications/subscriptions.AddFolder.smarty
+++ b/templates/kt3/notifications/subscriptions.AddFolder.smarty
@@ -1,8 +1,7 @@
 <dt class="actionitem subscription">{$info.title}</dt>
 <dd class="actionmessage">
 <!-- could break this up. -->
-    The folder "{$info.object_name}" was added{if ($info.location_name !== null)} to "{$info.location_name}"{/if}{if ($info.has_actor)} 
-	by {$info.actor_name}{/if}.
+    {i18n arg_object_name=$info.object_name}The folder "#object_name#" was added{/i18n}{if ($info.location_name !== null)} {i18n arg_location_name=$info.location_name}to "#location_name#"{/i18n}{/if}{if ($info.has_actor)} {i18n arg_actor_name=$info.actor_name}by #actor_name#{/i18n}{/if}.
     <div class="actionoptions">
             {if !$is_broken}
         <a href="{ktLink base="notify.php" query="id=`$info.notify_id`"}">{i18n}View New Folder{/i18n}</a>
diff --git a/templates/kt3/notifications/subscriptions.ArchivedDocument.smarty b/templates/kt3/notifications/subscriptions.ArchivedDocument.smarty
index bf8d78d..6a76cd6 100644
--- a/templates/kt3/notifications/subscriptions.ArchivedDocument.smarty
+++ b/templates/kt3/notifications/subscriptions.ArchivedDocument.smarty
@@ -1,9 +1,7 @@
 <dt class="actionitem subscription">{$info.title}</dt>
 <dd class="actionmessage">
 <!-- could break this up. -->
-    The document "{$info.object_name}" {if ($info.location_name !== null)} from "{$info.location_name}"{/if} was archived{if ($info.has_actor)} 
-	by {$info.actor_name}{/if}.
-
+    {i18n arg_object_name=$info.object_name}The document "#object_name#"{/i18n}{if ($info.location_name !== null)} {i18n arg_location_name=$info.location_name}from "#location_name#"{/i18n}{/if} {i18n}was archived{/i18n}{if ($info.has_actor)} {i18n arg_actor_name=$info.actor_name}by #actor_name#{/i18n}{/if}.
     <div class="actionoptions">    
         <a href="{ktLink base="notify.php" query="id=`$info.notify_id`&notify_action=clear"}">{i18n}Clear Alert{/i18n}</a>
     </div>
diff --git a/templates/kt3/notifications/subscriptions.CheckInDocument.smarty b/templates/kt3/notifications/subscriptions.CheckInDocument.smarty
index 55f15b0..a5e0a5f 100644
--- a/templates/kt3/notifications/subscriptions.CheckInDocument.smarty
+++ b/templates/kt3/notifications/subscriptions.CheckInDocument.smarty
@@ -1,8 +1,7 @@
 <dt class="actionitem subscription">{$info.title}</dt>
 <dd class="actionmessage">
 <!-- could break this up. -->
-    The document "{$info.object_name}" has been checked in{if ($info.has_actor)} 
-	by {$info.actor_name}{/if}, in the folder "{$info.location_name}".
+    {i18n arg_object_name=$info.object_name}The document "#object_name#" has been checked in{/i18n}{if ($info.has_actor)} {i18n arg_actor_name=$info.actor_name}by #actor_name#{/i18n}{/if}{if ($info.location_name !== null)}, {i18n arg_location_name=$info.location_name}in the folder "#location_name#"{/i18n}{/if}.
     <div class="actionoptions">    
         {if !$is_broken}
         <a href="{ktLink base="notify.php" query="id=`$info.notify_id`"}">{i18n}View Document{/i18n}</a>
diff --git a/templates/kt3/notifications/subscriptions.CheckOutDocument.smarty b/templates/kt3/notifications/subscriptions.CheckOutDocument.smarty
index 70cc896..7be60f7 100644
--- a/templates/kt3/notifications/subscriptions.CheckOutDocument.smarty
+++ b/templates/kt3/notifications/subscriptions.CheckOutDocument.smarty
@@ -1,8 +1,7 @@
 <dt class="actionitem subscription">{$info.title}</dt>
 <dd class="actionmessage">
 <!-- could break this up. -->
-    The document "{$info.object_name}" has been checked out{if ($info.has_actor)} 
-	by {$info.actor_name}{/if}, in the folder "{$info.location_name}".
+    {i18n arg_object_name=$info.object_name}The document "#object_name#" has been checked out{/i18n}{if ($info.has_actor)} {i18n arg_actor_name=$info.actor_name}by #actor_name#{/i18n}{/if}{if ($info.location_name !== null)}, {i18n arg_location_name=$info.location_name}from the folder "#location_name#"{/i18n}{/if}.
     <div class="actionoptions">    
         {if !$is_broken}
         <a href="{ktLink base="notify.php" query="id=`$info.notify_id`"}">{i18n}View Document{/i18n}</a>
diff --git a/templates/kt3/notifications/subscriptions.ModifyDocument.smarty b/templates/kt3/notifications/subscriptions.ModifyDocument.smarty
index 0031d8e..1e78df6 100644
--- a/templates/kt3/notifications/subscriptions.ModifyDocument.smarty
+++ b/templates/kt3/notifications/subscriptions.ModifyDocument.smarty
@@ -1,8 +1,7 @@
 <dt class="actionitem subscription">{$info.title}</dt>
 <dd class="actionmessage">
 <!-- could break this up. -->
-    The document "{$info.object_name}" has been changed in the folder "{$info.location_name}"{if ($info.has_actor)} 
-	by {$info.actor_name}{/if}. 
+    {i18n arg_object_name=$info.object_name}The document "#object_name#" has been changed{/i18n}{if ($info.location_name !== null)} {i18n arg_location_name=$info.location_name}in the folder "#location_name#"{/i18n}{/if}{if ($info.has_actor)} {i18n arg_actor_name=$info.actor_name}by #actor_name#{/i18n}{/if}.
     <div class="actionoptions">    
         {if !$is_broken}
         <a href="{ktLink base="notify.php" query="id=`$info.notify_id`"}">{i18n}View Document{/i18n}</a>
diff --git a/templates/kt3/notifications/subscriptions.MoveDocument.smarty b/templates/kt3/notifications/subscriptions.MoveDocument.smarty
index c99be90..835e559 100644
--- a/templates/kt3/notifications/subscriptions.MoveDocument.smarty
+++ b/templates/kt3/notifications/subscriptions.MoveDocument.smarty
@@ -1,8 +1,7 @@
 <dt class="actionitem subscription">{$info.title}</dt>
 <dd class="actionmessage">
 <!-- could break this up. -->
-    The document "{$info.object_name}" has been moved to the folder "{$info.location_name}"{if ($info.has_actor)} 
-	by {$info.actor_name}{/if}.
+    {i18n arg_object_name=$info.object_name}The document "#object_name#" has been moved{/i18n}{if ($info.location_name !== null)} {i18n arg_location_name=$info.location_name}to the folder "#location_name#"{/i18n}{/if}{if ($info.has_actor)} {i18n arg_actor_name=$info.actor_name}by #actor_name#{/i18n}{/if}.
     <div class="actionoptions">    
         {if !$is_broken}
         <a href="{ktLink base="notify.php" query="id=`$info.notify_id`"}">{i18n}View New Location{/i18n}</a>
diff --git a/templates/kt3/notifications/subscriptions.RemoveChildDocument.smarty b/templates/kt3/notifications/subscriptions.RemoveChildDocument.smarty
index 4cbb4aa..eed935e 100644
--- a/templates/kt3/notifications/subscriptions.RemoveChildDocument.smarty
+++ b/templates/kt3/notifications/subscriptions.RemoveChildDocument.smarty
@@ -1,10 +1,8 @@
 <dt class="actionitem subscription">{$info.title}</dt>
 <dd class="actionmessage">
 <!-- could break this up. -->
-    The document "{$info.object_name}" has been removed from the folder "{$info.location_name}" (to which you are subscribed){if ($info.has_actor)} 
-	by {$info.actor_name}{/if}.
+    {i18n arg_object_name=$info.object_name}The document "#object_name#" has been removed{/i18n}{if ($info.location_name !== null)} {i18n arg_location_name=$info.location_name}from the folder "#location_name#"{/i18n} ({i18n}to which you are subscribed{/i18n}){/if}{if ($info.has_actor)} {i18n arg_actor_name=$info.actor_name}by #actor_name#{/i18n}{/if}.
     <div class="actionoptions">    
-        
         {if !$is_broken}
         <a href="{ktLink base="notify.php" query="id=`$info.notify_id`"}">{i18n}View Folder{/i18n}</a>
         {else}
diff --git a/templates/kt3/notifications/subscriptions.RemoveChildFolder.smarty b/templates/kt3/notifications/subscriptions.RemoveChildFolder.smarty
index be1c33e..14598e1 100644
--- a/templates/kt3/notifications/subscriptions.RemoveChildFolder.smarty
+++ b/templates/kt3/notifications/subscriptions.RemoveChildFolder.smarty
@@ -1,8 +1,7 @@
 <dt class="actionitem subscription">{$info.title}</dt>
 <dd class="actionmessage">
 <!-- could break this up. -->
-    The folder "{$info.object_name}" was removed{if ($info.location_name !== null)} from "{$info.location_name}"{/if}{if ($info.has_actor)} 
-	by {$info.actor_name}{/if}.
+    {i18n arg_object_name=$info.object_name}The folder "#object_name#" has been removed{/i18n}{if ($info.location_name !== null)} {i18n arg_location_name=$info.location_name}from "#location_name#"{/i18n}{/if}{if ($info.has_actor)} {i18n arg_actor_name=$info.actor_name}by #actor_name#{/i18n}{/if}.
     <div class="actionoptions">
         {if !$is_broken}
         <a href="{ktLink base="notify.php" query="id=`$info.notify_id`"}">{i18n}View Folder{/i18n}</a> 
diff --git a/templates/kt3/notifications/subscriptions.RemoveSubscribedDocument.smarty b/templates/kt3/notifications/subscriptions.RemoveSubscribedDocument.smarty
index 8e312f0..e2bba38 100644
--- a/templates/kt3/notifications/subscriptions.RemoveSubscribedDocument.smarty
+++ b/templates/kt3/notifications/subscriptions.RemoveSubscribedDocument.smarty
@@ -1,8 +1,7 @@
 <dt class="actionitem subscription">{$info.title}</dt>
 <dd class="actionmessage">
 <!-- could break this up. -->
-    The document "{$info.object_name}" to which you were subscribed, has been removed{if ($info.has_actor)} 
-	by {$info.actor_name}{/if}.
+    {i18n arg_object_name=$info.object_name}The document "#object_name#" to which you were subscribed, has been removed{/i18n}{if ($info.has_actor)} {i18n arg_actor_name=$info.actor_name}by #actor_name#{/i18n}{/if}.
     <div class="actionoptions">    
         <a href="{ktLink base="notify.php" query="id=`$info.notify_id`&notify_action=clear"}">{i18n}Clear Alert{/i18n}</a>
     </div>
diff --git a/templates/kt3/notifications/subscriptions.RemoveSubscribedFolder.smarty b/templates/kt3/notifications/subscriptions.RemoveSubscribedFolder.smarty
index b828c93..2ec15ad 100644
--- a/templates/kt3/notifications/subscriptions.RemoveSubscribedFolder.smarty
+++ b/templates/kt3/notifications/subscriptions.RemoveSubscribedFolder.smarty
@@ -1,8 +1,7 @@
 <dt class="actionitem subscription">{$info.title}</dt>
 <dd class="actionmessage">
 <!-- could break this up. -->
-    The folder "{$info.object_name}" to which you were subscribed, was removed{if ($info.has_actor)} 
-	by {$info.actor_name}{/if}.
+    {i18n arg_object_name=$info.object_name}The folder "#object_name#" to which you were subscribed, has been removed{/i18n}{if ($info.has_actor)} {i18n arg_actor_name=$info.actor_name}by #actor_name#{/i18n}{/if}.
     <div class="actionoptions">    
     <a href="{ktLink base="notify.php" query="id=`$info.notify_id`&notify_action=clear"}">{i18n}Clear Alert{/i18n}</a>
     </div>
diff --git a/templates/kt3/notifications/subscriptions.RestoreDocument.smarty b/templates/kt3/notifications/subscriptions.RestoreDocument.smarty
index 938871b..80dc92b 100644
--- a/templates/kt3/notifications/subscriptions.RestoreDocument.smarty
+++ b/templates/kt3/notifications/subscriptions.RestoreDocument.smarty
@@ -1,7 +1,7 @@
 <dt class="actionitem subscription">{$info.title}</dt>
 <dd class="actionmessage">
 <!-- could break this up. -->
-    The document "{$info.object_name}" has been restored by an administrator.
+    {i18n arg_object_name=$info.object_name}The document "#object_name#" has been restored by an administrator.{/i18n}
     <div class="actionoptions">    
         <a href="{ktLink base="notify.php" query="id=`$info.notify_id`&notify_action=clear"}">{i18n}Clear Alert{/i18n}</a>
     </div>
--
libgit2 0.21.4