• last updated 20 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merged 5.3 to HEAD

  1. … 58 more files in changeset.
Minor bugfix to make sure that the parameter is found even when upgrading the packages

Fixing two things I forgot

Introduced (from AIMS product by Quest) the KeepLocalTranslations Parameter which allows anyone to keep their local changes even if the merge function believes the local change should be overwritten. A conflict is raised in this case. Additionally made sure we cannot register a message to a non existent package_key. Also be a little bit more conservative when deleting message keys (so they can only be deleted from the main locale, otherwise only unregistered

    • -17
    • +47
    ./www/admin/localized-message-new.tcl
Update info files for 5.3.2 final

  1. … 17 more files in changeset.
Created changelog, bumped version numbers

  1. … 19 more files in changeset.
Mark as Selected the current locale in the select_locale widget

Bump version numbers to 5.3.2b1

  1. … 18 more files in changeset.
Merged the 5.3 branch with HEAD. Look for tags with the pattern

drb-*-20070513

    • -1
    • +1
    ./catalog/acs-lang.ast_ES.ISO-8859-1.xml
    • -3
    • +4
    ./catalog/acs-lang.ca_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/acs-lang.da_DK.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/acs-lang.de_DE.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/acs-lang.en_GB.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/acs-lang.en_US.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/acs-lang.es_CO.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/acs-lang.es_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/acs-lang.es_GT.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/acs-lang.eu_ES.ISO-8859-1.xml
  1. … 310 more files in changeset.
Apply new format from timeanddate.com to retrieve UTC time

Importing catalog files from traslate.openacs.org for Openacs Core Packages (5.3.1)

and .LRN Packages (2.3.0).

    • -1
    • +1
    ./catalog/acs-lang.ast_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/acs-lang.ca_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/acs-lang.da_DK.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/acs-lang.de_DE.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/acs-lang.en_GB.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/acs-lang.en_US.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/acs-lang.es_CO.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/acs-lang.es_ES.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/acs-lang.es_GT.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/acs-lang.eu_ES.ISO-8859-1.xml
  1. … 982 more files in changeset.
Bumped versio number

  1. … 18 more files in changeset.
Bumped version numbers to 5.3.1 beta 1

  1. … 18 more files in changeset.
Greek translation

  1. … 24 more files in changeset.
Bumped to 5.3.1a1. I hope. I never get this right!

  1. … 18 more files in changeset.
Spanish translation

    • -1
    • +1
    ./catalog/acs-lang.es_ES.ISO-8859-1.xml
  1. … 44 more files in changeset.
Zen: version change

    • -1
    • +1
    ./catalog/acs-lang.en_US.ISO-8859-1.xml
  1. … 10 more files in changeset.
Replace section element property with new form section element

  1. … 1 more file in changeset.
Nima's commit overwrote a bunch of my changes, and other peoples too! Apparently

he didn't merge, but overwrote! NO!

  1. … 7 more files in changeset.
Local changes at Mannheim. Mostly merging catalog files

  1. … 35 more files in changeset.
Set the charset from the locale for the content-type meta information. This

wasn't being tracked in ad_conn, nor cached by acs-lang, nor used by

lrn-master. It's now tracked in ad_conn, cached by acs-lang, and used

properly by lrn-master.

  1. … 2 more files in changeset.
Merging catalog files to oacs-5-3 from oacs-5-2 for acs-lang

    • -2
    • +3
    ./catalog/acs-lang.ca_ES.ISO-8859-1.xml
Zen project: add ID attribute for select_locales widget

Grrr, I didn't commit bumped version numbers before making the 5.3.0 tarball

  1. … 18 more files in changeset.
Normalizing string comparison operations into tcl 8.4 operations, enabling byte-code compilation for expressions and many conditionals

    • -6
    • +6
    ./www/admin/edit-localized-message.tcl
  1. … 353 more files in changeset.
Bumped version numbers to 5.3.0b2. Made acs-mail-lite auto-install.

  1. … 18 more files in changeset.
First round of oacs-5-3 merge to HEAD commits

    • -2
    • +2
    ./catalog/acs-lang.en_AU.ISO-8859-1.xml
    • -0
    • +1
    ./catalog/acs-lang.en_GB.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/acs-lang.en_US.ISO-8859-1.xml
    • -0
    • +12
    ./catalog/acs-lang.gl_ES.ISO-8859-1.xml
    • -5
    • +5
    ./catalog/acs-lang.nl_NL.ISO-8859-1.xml
    • -0
    • +52
    ./catalog/acs-lang.nl_ZA.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/acs-lang.nn_NO.ISO-8859-1.xml
    • -0
    • +8
    ./catalog/acs-lang.pt_BR.ISO-8859-1.xml
    • -1
    • +11
    ./www/admin/edit-localized-message.tcl
  1. … 82 more files in changeset.
Picked up some changes missed by the join of oacs-5-2 and oacs-5-3. It turns

out the cvs won't join files if it has already done some merging previously.

In this case I'd previously merged oacs-5-2 to HEAD, then branched oacs-5-3, then

reopened the 5.2 branch for minor bug fixing for .LRN 2.2.1. This confused

CVS or ... at least made it stubborn.

    • -2
    • +2
    ./catalog/acs-lang.en_AU.ISO-8859-1.xml
  1. … 5 more files in changeset.
Merged oacs-5-2 -> oacs-5-3 branches.

    • -0
    • +1
    ./catalog/acs-lang.en_GB.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/acs-lang.en_US.ISO-8859-1.xml
    • -0
    • +12
    ./catalog/acs-lang.gl_ES.ISO-8859-1.xml
    • -5
    • +5
    ./catalog/acs-lang.nl_NL.ISO-8859-1.xml
    • -0
    • +52
    ./catalog/acs-lang.nl_ZA.ISO-8859-1.xml
    • -1
    • +1
    ./catalog/acs-lang.nn_NO.ISO-8859-1.xml
    • -0
    • +8
    ./catalog/acs-lang.pt_BR.ISO-8859-1.xml
    • -1
    • +11
    ./www/admin/edit-localized-message.tcl
  1. … 55 more files in changeset.
file acs-lang.nl_ZA.ISO-8859-1.xml was added on branch oacs-5-3 on 2006-12-14 13:55:08 +0000

    • -0
    • +0
    ./catalog/acs-lang.nl_ZA.ISO-8859-1.xml