Index: openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl,v
diff -u -r1.24 -r1.25
--- openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl	18 May 2018 09:47:09 -0000	1.24
+++ openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl	3 Sep 2024 15:37:33 -0000	1.25
@@ -9,11 +9,11 @@
     @cvs-id $Id$
 
 } {
-    locale
-    package_key
-    message_key
-    show:optional
-    {usage_p:boolean "f"}
+    locale:word
+    package_key:token
+    message_key:token
+    show:word,optional
+    {usage_p:boolean,notnull "f"}
     {return_url:localurl {}}
 }
 
@@ -36,20 +36,30 @@
 
 set page_title "Edit $package_key.$message_key"
 set context [list [list [export_vars -base package-list { locale }] $locale_label] \
-                 [list [export_vars -base message-list { locale package_key show }] $package_key] \
+                 [list [export_vars -no_empty -base message-list { locale package_key show }] $package_key] \
                  "$package_key.$message_key"]
 
 
 # We let you create/delete messages keys if you're in the default locale
 set create_p [string equal $current_locale $default_locale]
 
-set description_edit_url [export_vars -base edit-description { locale package_key message_key show }]
+set description_edit_url [export_vars -no_empty -base edit-description { locale package_key message_key show }]
+set default_locale_edit_url [export_vars -base edit-localized-message { {locale $default_locale} package_key message_key return_url }]
 
-set usage_hide_url [export_vars -base [ad_conn url] { locale package_key message_key show return_url }]
-set usage_show_url [export_vars -base [ad_conn url] { locale package_key message_key show {usage_p 1} return_url }]
+set usage_hide_url [export_vars -no_empty -base [ad_conn url] { locale package_key message_key show return_url }]
+set usage_show_url [export_vars -no_empty -base [ad_conn url] { locale package_key message_key show {usage_p 1} return_url }]
 
-set delete_url [export_vars -base message-delete { locale package_key message_key show {return_url {[ad_return_url]}} }]
+set delete_url      [export_vars -no_empty -base message-delete       { locale package_key message_key show {return_url {[ad_return_url]}} }]
+set undelete_url    [export_vars -no_empty -base message-undelete     { locale package_key message_key show {return_url {[ad_return_url]}} }]
+set unregister_url  [export_vars -no_empty -base message-unregister   { locale package_key message_key show {return_url {[ad_return_url]}} }]
 
+set deleted_p [db_string get_deleted_p {
+    select deleted_p
+    from   lang_messages
+    where  package_key = :package_key
+    and    message_key = :message_key
+    and    locale = :current_locale
+} -default false]
 
 ad_form -name message_form -form {
     {locale:text(hidden),optional {value $current_locale}}
@@ -62,22 +72,24 @@
         {label "Message Key"}
         {value "$package_key.$message_key"}
     }
-    {description:text(inform)
+    {description:text(inform),optional
         {label "Description"}
-        {after_html {}}
+        {mode display}
+        {after_html {(<a href='[ns_quotehtml $description_edit_url]'>Edit</a>)}}
     }
 }
 
 if { $default_locale ne $current_locale } {
     ad_form -extend -name message_form -form {
         {original_message:text(inform)
             {label "$default_locale_label Message"}
+            {after_html {(<a href="[ns_quotehtml $default_locale_edit_url]">Edit</a>)}}
         }
     }
 }
 
 ad_form -extend -name message_form -form {
-    {message:text(textarea)
+    {message:text(textarea),optional
         {label "$locale_label Message"}
         {html { rows 6 cols 40 } }
     }
@@ -117,18 +129,14 @@
         and    cu.user_id = lm.creation_user
     }]
 
-    if { [info exists message] && $message ne "" } {
+    if { [info exists message] } {
         set message $message
     } else {
         set message $original_message
     }
     set original_message [ns_quotehtml $original_message]
 
-    if { $description eq "" } {
-        set description [subst {(<a href="[ns_quotehtml $description_edit_url]">add description</a>)}]
-    } else {
-        set description "[ad_text_to_html -- $description] (<a href='[ns_quotehtml $description_edit_url]'>edit</a>)"
-    }
+    set description "[ad_text_to_html -- $description]"
 
     # Augment the audit trail with info on who created the first message
     if { $current_locale ne $default_locale && $translated_p } {
@@ -186,7 +194,7 @@
     lang::message::register -comment $comment $locale $package_key $message_key $message
 
     if { $return_url eq "" } {
-        set return_url [export_vars -base [ad_conn url] { locale package_key message_key show }]
+        set return_url [export_vars -no_empty -base [ad_conn url] { locale package_key message_key show }]
     }
     ad_returnredirect $return_url
     ad_script_abort