Index: openacs-4/packages/acs-datetime/tcl/acs-datetime-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/tcl/acs-datetime-procs.tcl,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/acs-datetime/tcl/acs-datetime-procs.tcl 23 Jul 2018 12:46:53 -0000 1.17
+++ openacs-4/packages/acs-datetime/tcl/acs-datetime-procs.tcl 23 Jul 2018 12:54:26 -0000 1.18
@@ -144,10 +144,10 @@
set gregorian 2299161
if {$julian_date >= $gregorian} {
- set calc [expr {floor((($julian_date - 1867216) - 0.25) / 36524.25)}]
- set calc [expr {$julian_date + 1 + $calc - floor(0.25 * $calc)}]
+ set calc [expr {floor((($julian_date - 1867216) - 0.25) / 36524.25)}]
+ set calc [expr {$julian_date + 1 + $calc - floor(0.25 * $calc)}]
} else {
- set calc $julian_date
+ set calc $julian_date
}
# get initial calculations to set year, month, day
@@ -160,10 +160,10 @@
set year [expr {floor($calc2 - 4715)}]
set month [expr {floor($calc4 - 1)}]
if {$month > 12} {
- set month [expr {$month - 12}]
+ set month [expr {$month - 12}]
}
if {$month > 2 || $year <= 0} {
- set year [expr {$year - 1}]
+ set year [expr {$year - 1}]
}
set day [expr {floor($calc - $calc3 - floor($calc4 * 30.6001))}]
@@ -216,7 +216,7 @@
set month 01
} elseif {$month == 12} {
incr year
- set month 01
+ set month 01
} elseif {$month == 13} {
incr year
set month 02
@@ -265,10 +265,10 @@
@return the ANSI date for the previous month
} {
if {$month == 1} {
- set year [expr {$year - 1}]
- set month 12
+ set year [expr {$year - 1}]
+ set month 12
} else {
- set month [expr {$month - 1}]
+ set month [expr {$month - 1}]
}
# jarkko: added this check to avoid calendars bombing when prev month goes
@@ -310,10 +310,10 @@
@return the ANSI date for the previous month
} {
if {$month == 1} {
- set year [expr {$year - 1}]
- set month 12
+ set year [expr {$year - 1}]
+ set month 12
} else {
- set month [expr {$month - 1}]
+ set month [expr {$month - 1}]
}
# jarkko: added this check to avoid calendars bombing when prev month goes
@@ -599,7 +599,6 @@
return $precision
}
-
# Local variables:
# mode: tcl
# tcl-indent-level: 4
Index: openacs-4/packages/acs-lang/www/admin/batch-editor.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/batch-editor.tcl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/acs-lang/www/admin/batch-editor.tcl 23 Jul 2018 12:25:25 -0000 1.12
+++ openacs-4/packages/acs-lang/www/admin/batch-editor.tcl 23 Jul 2018 12:54:26 -0000 1.13
@@ -21,22 +21,15 @@
[list [export_vars -base message-list {locale package_key show}] $package_key] \
$page_title]
-
-
-
-
# TODO: PG
-
-
-
#####
#
# Handle filtering
#
#####
-# LARS: The reason I implemented this overly complex way of doing it is that I was just about to
+# LARS: The reason I implemented this overly complex way of doing it is that I was just about to
# merge this page with messages-search ...
set where_clauses [list]
@@ -45,17 +38,17 @@
switch -exact $show {
translated {
lappend where_clauses {lm2.message is not null}
- lappend keys_where_clauses {exists (select 1
- from lang_messages lm
- where lm.package_key = lmk.package_key
+ lappend keys_where_clauses {exists (select 1
+ from lang_messages lm
+ where lm.package_key = lmk.package_key
and lm.message_key = lmk.message_key
and lm.locale = :current_locale)}
}
untranslated {
lappend where_clauses {lm2.message is null}
- lappend keys_where_clauses {not exists (select 1
- from lang_messages lm
- where lm.package_key = lmk.package_key
+ lappend keys_where_clauses {not exists (select 1
+ from lang_messages lm
+ where lm.package_key = lmk.package_key
and lm.message_key = lmk.message_key
and lm.locale = :current_locale)}
}
@@ -70,8 +63,6 @@
set keys_where_clause "and [join $keys_where_clauses "\n and "]"
}
-
-
#####
#
# Counting messages
@@ -89,19 +80,14 @@
set num_translated_pretty [lc_numeric $num_translated]
set num_untranslated_pretty [lc_numeric $num_untranslated]
-
-
-
-
#####
#
# Initialize pagination
#
#####
-
set keys [db_list get_keys "
- select lmk.message_key
+ select lmk.message_key
from lang_message_keys lmk
where lmk.package_key = :package_key
$keys_where_clause
@@ -111,10 +97,6 @@
set total [llength $keys]
set page_end [expr {$page_start + 10}]
-
-
-
-
#####
#
# Build the form
@@ -123,7 +105,7 @@
set edit_buttons [list]
-if { $show ne "untranslated" && $page_start > 0 } {
+if { $show ne "untranslated" && $page_start > 0 } {
lappend edit_buttons { "< Update and back" "prev" }
}
@@ -157,22 +139,22 @@
db_foreach get_messages {} {
ad_form -extend -name batch_editor -form \
[list [list "message_key_$count:text(hidden)" {value $message_key}]]
-
+
set message_url [export_vars -base edit-localized-message { locale package_key message_key show }]
# Adding section
set section_name "$package_key.$message_key"
if { ![info exists sections($section_name)] } {
- set sec [list "-section" $section_name {legendtext "$section_name"}]
- ad_form -extend -name batch_editor -form [list $sec]
- set sections($section_name) "$section_name"
+ set sec [list "-section" $section_name {legendtext "$section_name"}]
+ ad_form -extend -name batch_editor -form [list $sec]
+ set sections($section_name) "$section_name"
}
ad_form -extend -name batch_editor -form \
[list [list "message_key_pretty_$count:text(inform)" \
{label "Message Key"} \
{value "$package_key.$message_key"}]]
-
+
if { $description ne "" } {
set description_edit_url [export_vars -base edit-description { locale package_key message_key show }]
set description "[ad_text_to_html -- $description] [subst { (edit)}]"
@@ -189,7 +171,7 @@
{label $default_locale_label} \
{value {[ns_quotehtml $default_message]}}]]
}
-
+
if { [string length $translated_message] > 80 } {
set html { cols 80 rows 15 }
} else {
@@ -204,7 +186,7 @@
# We set this as a local variable, so that ad_form's normal system works
set message_$count $translated_message
-
+
incr count
}
@@ -214,7 +196,7 @@
} -on_submit {
for { set i $page_start } { $i < $page_end && $i < $total } { incr i } {
-
+
if { [set org_message_$i] ne [set message_$i] } {
lang::message::register $current_locale $package_key \
[set message_key_$i] \
@@ -228,7 +210,7 @@
switch $button {
prev {
set page_start [expr {$page_start - 10}]
- if { $page_start < 0 } {
+ if { $page_start < 0 } {
set page_start 0
}
}
@@ -239,14 +221,12 @@
}
}
}
- }
+ }
ad_returnredirect [export_vars -base [ad_conn url] { locale package_key show page_start }]
- ad_script_abort
+ ad_script_abort
}
-
-
#####
#
# Slider for pagination
@@ -260,8 +240,8 @@
if { $end_page > $total-1 } {
set end_page [expr {$total-1}]
}
-
-
+
+
set text {}
if { [string match "lt_*" [lindex $keys $count]] } {
append text [string range [lindex $keys $count] 3 5]
@@ -283,10 +263,6 @@
[expr {$count / 100}]
}
-
-
-
-
#####
#
# Slider for 'show' options
@@ -299,18 +275,17 @@
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 extend show_opts url selected_p
multirow foreach show_opts {
set selected_p [string equal $show $value]
if {$value eq "all"} {
set url [export_vars -base [ad_conn url] { locale package_key }]
- } else {
+ } else {
set url [export_vars -base [ad_conn url] { locale package_key {show $value} }]
}
}
-
# Local variables:
# mode: tcl
# tcl-indent-level: 4