You are editing locale: @locale_label@ [ @current_locale@ ]
+
+ Show:
+
-
@pagination.text@
-
- |
- @pagination.text@
-
- |
-
- |
+
@pagination.text@
+
+ |
+ @pagination.text@
+
+ |
+
+ |
-
@pagination.text@
-
- |
- @pagination.text@
-
- |
-
- |
+
@pagination.text@
+
+ |
+ @pagination.text@
+
+ |
+
+ |
[ad_quotehtml $default_message]"
-
- if { [form is_request batch_editor] } {
- element set_properties batch_editor "message_$count" -value [ad_decode $translated_message "" "TRANSLATION MISSING" $translated_message]
- }
-
incr count
}
+ad_form -extend -name batch_editor -on_request {
+ # Set from local vars
+} -on_submit {
-# create pagination multiple
+ for { set i $page_start } { $i < $page_end && $i < $total } { incr i } {
+
+ if { ![string equal [set org_message_$i] [set message_$i]] } {
+ lang::message::register $current_locale $package_key \
+ [set message_key_$i] \
+ [set message_$i]
+ }
+ }
+ set button [form::get_button batch_editor]
+
+ if { ![string equal $button "ok"] } {
+ switch $button {
+ prev {
+ set page_start [expr $page_start - 10]
+ if { $page_start < 0 } {
+ set page_start 0
+ }
+ }
+ next {
+ set page_start [expr $page_start + 10]
+ if { $page_start > $total } {
+ set page_start [expr $total - ($total % 10)]
+ }
+ }
+ }
+ }
+
+ ad_returnredirect "[ad_conn url]?[export_vars { locale package_key show page_start }]"
+ ad_script_abort
+}
+
+
+
+#####
+#
+# Slider for pagination
+#
+#####
+
multirow create pagination text hint url selected group
+
for {set count 0} {$count < $total} {incr count 10 } {
set end_page [expr $count + 9]
if { $end_page > [expr $total-1] } {
@@ -102,19 +265,38 @@
append text [string range [lindex $keys $end_page] 0 2]
}
- multirow append pagination $text "[lindex $keys $count] - [lindex $keys $end_page]" "batch-editor?page_start=$count&page_end=[expr $count+10]&locale=$locale&package_key=$package_key" [expr $count == $page_start] [expr $count / 100]
+ multirow append pagination \
+ $text \
+ "[lindex $keys $count] - [lindex $keys $end_page]" \
+ "batch-editor?[export_vars { { page_start $count } locale package_key show }]" \
+ [expr $count == $page_start] \
+ [expr $count / 100]
}
-# is this a valid submit? then register the messages
-if { [form is_valid batch_editor] } {
- for {set count $page_start} {($count < $page_end) && ($count < $total)} {incr count} {
- # Register message via acs-lang
- set message_key [element get_value batch_editor "message_key_$count"]
- set message [element get_value batch_editor "message_$count"]
- if { $message != "TRANSLATION MISSING" } {
- lang::message::register $locale $package_key $message_key $message
- }
+
+
+#####
+#
+# Slider for 'show' options
+#
+#####
+
+multirow create show_opts value label count
+
+multirow append show_opts "all" "All" $num_messages_pretty
+multirow append show_opts "translated" "Translated" $num_translated_pretty
+multirow append show_opts "untranslated" "Untranslated" $num_untranslated_pretty
+
+multirow extend show_opts url selected_p
+
+multirow foreach show_opts {
+ set selected_p [string equal $show $value]
+ if { [string equal $value "all"] } {
+ set url "[ad_conn url]?[export_vars { locale package_key }]"
+ } else {
+ set url "[ad_conn url]?[export_vars { locale package_key {show $value} }]"
}
}
+
Fisheye: Tag 1.8 refers to a dead (removed) revision in file `openacs-4/packages/acs-lang/www/admin/display-grouped-messages.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `openacs-4/packages/acs-lang/www/admin/display-grouped-messages.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.8 refers to a dead (removed) revision in file `openacs-4/packages/acs-lang/www/admin/display-localized-messages.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `openacs-4/packages/acs-lang/www/admin/display-localized-messages.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/acs-lang/www/admin/edit-description.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/edit-description.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/www/admin/edit-description.adp 14 Aug 2003 16:06:20 -0000 1.1
@@ -0,0 +1,6 @@
+
+
+
+
+
+
-
-
-
-
-
-Audit Trail
-Please, submit a valid locale.
+Files that use this message
++ Show | Hide files that use this message. +
+Locale: @locale_label@ [ @current_locale@ ]
-Package: @package_key@
-Key: @message_key@
- -+ Show | Hide files that use this message key. +
- » Show message key usage -
- -
-
-
-
-
-
Here you can edit locales and internationalize messages in the user interface of the system.
-
»
- Toggle translator mode (Currently
-
+ » Change system locale: Current system locale is @system_locale_label@ [ @system_locale@ ] +
-System Locales
- -Timezone
-- » - Set system timezone + » Change system timezone: Current system timezone is @timezone@
Installed Locales
+ +
+
|
+
+ 
+ » Create New Locale +
+ + + + Index: openacs-4/packages/acs-lang/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/index.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-lang/www/admin/index.tcl 13 Feb 2003 14:26:50 -0000 1.4 +++ openacs-4/packages/acs-lang/www/admin/index.tcl 14 Aug 2003 16:06:20 -0000 1.5 @@ -5,22 +5,68 @@ Administration of the localized messages @author Bruno MattarolloDeleting locale @locale_label@ [ @locale@ ]
-Please update the necesary fields and press "Submit"
Index: openacs-4/packages/acs-lang/www/admin/locale-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-edit.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-lang/www/admin/locale-edit.tcl 8 Aug 2003 12:21:28 -0000 1.5 +++ openacs-4/packages/acs-lang/www/admin/locale-edit.tcl 14 Aug 2003 16:06:20 -0000 1.6 @@ -10,7 +10,6 @@ @cvs-id $Id$ } { locale -} -properties { } # Get the locale for the user so that we 'spit' the content back in the @@ -23,7 +22,8 @@ # ns_setformencoding $encoding_charset # ns_set put [ns_conn outputheaders] "content-type" "text/html; charset=$encoding_charset" -set context_bar [ad_context_bar "Editing Locale"] +set page_title "Edit Locale" +set context [list $page_title] form create locale_editing Index: openacs-4/packages/acs-lang/www/admin/locale-make-default.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-make-default.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-lang/www/admin/locale-make-default.tcl 8 Aug 2003 12:21:28 -0000 1.3 +++ openacs-4/packages/acs-lang/www/admin/locale-make-default.tcl 14 Aug 2003 16:06:20 -0000 1.4 @@ -28,4 +28,7 @@ } +# Flush caches +util_memoize_flush_regexp {^lang::system::default_locale_not_cached} + template::forward "index?tab=locales" Index: openacs-4/packages/acs-lang/www/admin/locale-new.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-new.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-lang/www/admin/locale-new.adp 22 May 2003 14:05:12 -0000 1.6 +++ openacs-4/packages/acs-lang/www/admin/locale-new.adp 14 Aug 2003 16:06:20 -0000 1.7 @@ -1,6 +1,7 @@ -Please fill in the fields to create a new locale.
Index: openacs-4/packages/acs-lang/www/admin/locale-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-new.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-lang/www/admin/locale-new.tcl 17 Feb 2003 23:04:07 -0000 1.3 +++ openacs-4/packages/acs-lang/www/admin/locale-new.tcl 14 Aug 2003 16:06:20 -0000 1.4 @@ -7,13 +7,13 @@ @author Bruno Mattarollo
+
-
-
-
-
-
-
Index: openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl 8 Aug 2003 12:21:28 -0000 1.3
+++ openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl 14 Aug 2003 16:06:20 -0000 1.4
@@ -15,97 +15,90 @@
}
-# We check that this request is coming for the system wide default
-# locale. If not, we can't allow the creation of a new localized
-# message.
+# We rename to avoid conflict in queries
+set current_locale $locale
+set default_locale en_US
-if {[info exists locale]} {
- set locale_user $locale
-} else {
- set locale_user [ad_conn locale]
-}
+set locale_label [ad_locale_get_label $current_locale]
+set default_locale_label [ad_locale_get_label $default_locale]
-set default_locale en_US
+set page_title "Create New Message"
+set context [list [list "package-list?[export_vars { locale }]" $locale_label] \
+ [list "message-list?[export_vars { locale package_key show }]" $package_key] \
+ $page_title]
-if { $locale_user != $default_locale } {
- # ooops!
- # We should let the user know about this ... shouldn't we? noooooo... :)
- set encoded_locale [ns_urlencode $locale_user]
- ad_returnredirect "display-grouped-messages?locale=$encoded_locale"
-}
-set locale_label [ad_locale_get_label $locale_user]
-append return_url "display-grouped-messages?locale=" [ns_urlencode $locale_user]
+# We check that this request is coming for the system wide default
+# locale. If not, we can't allow the creation of a new localized
+# message.
-set tab [ns_urlencode "localized-messages"]
+if { ![string equal $current_locale $default_locale] } {
+ ad_return_error "Can only create messages in the default locale" "Can only create messages in the default locale"
+ ad_script_abort
+}
-set context_bar [ad_context_bar [list "index?tab=$tab" "Locales & Messages"] \
- [list "display-grouped-messages?tab=$tab&locale=$locale" "Listing"] \
- "New"]
+append return_url "message-list?[export_vars { locale package_key }]"
-template::form create message_new
+form create message_new
-template::element create message_new package_key_display -label "Package" -datatype text \
+element create message_new package_key_display -label "Package" -datatype text \
-widget inform -value $package_key
-template::element create message_new message_key -label "Message key" -datatype text -widget text
+element create message_new message_key -label "Message key" -datatype text -widget text -html { size 50 }
-template::element create message_new message -label "Message" -datatype text \
+element create message_new message -label "Message" -datatype text \
-widget textarea -html { rows 6 cols 40 }
-template::element create message_new package_key -datatype text -widget hidden
+element create message_new package_key -datatype text -widget hidden
# The two hidden tags that we need to pass on the key and language to the
# processing of the form
-template::element create message_new locale -label "locale" -datatype text -widget hidden
+element create message_new locale -label "locale" -datatype text -widget hidden
-if { [template::form is_request message_new] } {
+if { [form is_request message_new] } {
- template::element set_properties message_new package_key -value $package_key
- template::element set_properties message_new locale -value $locale_user
+ element set_properties message_new package_key -value $package_key
+ element set_properties message_new locale -value $current_locale
} else {
# We are not getting a request, so it's a post. Get and validate
# the values
- template::form get_values message_new
+ form get_values message_new
# We have to check the format of the key submitted by the user,
# We can't accept whitespaces or tabs, only alphanumerical and "-",
# "_" or "." characters. The 1st character can't be a "."
if { [regexp {[^[:alnum:]\_\-\.\?]} $message_key] } {
# We matched for a forbidden character
- template::element set_error message_new message_key \
+ element set_error message_new message_key \
"Key can only have alphanumeric or \"-\", \"_\", \".\" or \"?\" characters"
}
if { [string length $message_key] >= 200 } {
# Oops. The length of the key is too high.
- template::element set_error message_new key \
+ element set_error message_new key \
"Key can only have less than 200 characters"
}
}
-if { [template::form is_valid message_new] } {
+if { [form is_valid message_new] } {
# We get the values from the form
- template::form get_values message_new package_key
- template::form get_values message_new message_key
- template::form get_values message_new locale
- template::form get_values message_new message
+ form get_values message_new package_key message_key locale message
# We use the acs-lang registration of a translation. Simple, eh?
lang::message::register $locale $package_key $message_key $message
set escaped_locale [ns_urlencode $locale]
- template::forward $return_url
+ forward $return_url
}
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-lang/www/admin/localized-messages.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-lang/www/admin/localized-messages.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-lang/www/admin/lookups.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-lang/www/admin/lookups.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.7 refers to a dead (removed) revision in file `openacs-4/packages/acs-lang/www/admin/master.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/acs-lang/www/admin/message-list-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/Attic/message-list-oracle.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/www/admin/message-list-oracle.xql 14 Aug 2003 16:06:20 -0000 1.1
@@ -0,0 +1,29 @@
+
+
+Please, submit a valid locale.
- -Locale: @locale_label@ [ @locale_user@ ]
- -
+ Show:
+
+ » Create new message +
++ » Batch edit these messages +
+ +
+
|
+
Search Results
- -
-
|
-
+
|
+
@message_usage.file@:
++@message_usage.code@
+
+
|
+
Here's what the configuration looks like at this point: @@ -56,7 +56,7 @@
- You can use the form below to tell ACS what timezone Oracle is + You can use the form below to tell ACS what timezone your database is operating in. (There does not appear to be a nice way to ask the database this question automatically).
- -- Based on the UTC time retrieved from timeanddate.com, we believe that your server is set to one of the following timezones: -
--
+ Set Timezone: +
+- In case we're wrong, you can pick another timezone here: +
- -- Set Timezone: +
--
- - + Index: openacs-4/packages/acs-lang/www/admin/set-system-timezone.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/set-system-timezone.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-lang/www/admin/set-system-timezone.tcl 8 Aug 2003 12:21:28 -0000 1.3 +++ openacs-4/packages/acs-lang/www/admin/set-system-timezone.tcl 14 Aug 2003 16:06:20 -0000 1.4 @@ -2,7 +2,8 @@ ad_page_contract { Set the acs-lang system parameter which says what the local timezone offset is } { - {timezone ""} + {timezone_all ""} + {timezone_recommended ""} } -properties { page_title system_timezone @@ -17,11 +18,14 @@ ad_script_abort } -if {![empty_string_p $timezone]} { - lang::system::set_timezone $timezone +if { ![empty_string_p $timezone_recommended] } { + lang::system::set_timezone $timezone_recommended +} elseif { ![empty_string_p $timezone_all] } { + lang::system::set_timezone $timezone_all } set page_title "Set System Timezone" +set context [list $page_title] set system_timezone [lang::system::timezone] @@ -70,6 +74,8 @@ set delta_hours [expr round(($sysdate_utc_epoch - $utc_epoch)*4.0 / (60*60)) / 4.0] set recommended_offset [expr $system_utc_offset + $delta_hours] + set recommended_offset_pretty "UTC [format "+%d:%02d" [expr int($recommended_offset)] [expr int($recommended_offset*60) % 60]]" + if { $delta_hours == 0 } { set correct_p 1 } else {