Index: openacs-4/packages/xowiki/xowiki.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v diff -u -N -r1.138 -r1.139 --- openacs-4/packages/xowiki/xowiki.info 16 May 2011 12:29:11 -0000 1.138 +++ openacs-4/packages/xowiki/xowiki.info 20 May 2011 09:52:45 -0000 1.139 @@ -10,7 +10,7 @@ t xowiki - + Gustaf Neumann A more generic xotcl-based wikis example with object types and subtypes based on the content repository (with category support) @@ -56,7 +56,7 @@ BSD-Style 0 - + Index: openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml,v diff -u -N -r1.39 -r1.40 --- openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml 4 Jul 2010 16:47:35 -0000 1.39 +++ openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml 20 May 2011 09:52:45 -0000 1.40 @@ -2,63 +2,122 @@ Zusammenfassung + Hinzuf�gen Verwalten - Verwaltungsoptionen f�r dieses Paket ... + Alle Arten von %pretty_plural% verwalten + Verwaltungsoptionen f�r dieses Wiki... vor %time% + Alle Eintr�ge Zur�ck + von User/in Kategorien + %errorMsg% + Einstellungen Inhalt Kopiere Eintrag Neuen Eintrag vom Typ %type% erstellen Erzeuge diese Seite in der folgenden Sprache: + Ersteller/in Tag Tage L�schen + Alle l�schen + Wirklich alles l�schen? + Alle %pretty_plural% dieses Wikis l�schen + Alle Eintr�ge dieser Art l�schen + L�schen best�tigen? L�sche diese Seite ... - N�here Information + Kurzbeschreibung + Details Bearbeiten bearbeiten - Editiere diese Seite ... + Diese Seite bearbeiten ... Eintr�ge f�r das Formular %form%: - Dieses Formular wird noch von %count% Eintr�gen verwendet. Bitte verwenden Sie diese, bevor Sie das Formular l�schen. + Dieses Formular wird noch von %count% Eintr�gen verwendet. Bitte l�schen Sie diese, bevor Sie das Formular l�schen. + Fehler: Includelet '%page_name%' nicht bekannt + Fehler in Includelet '{{%arg%}}' auf Seite %name%: Termin Endzeit Vortragsende - um + um Ort Beginnzeit Vortragsbeginn Titel Vortragstitel - Kann von hochegeladener Datei �bernommen werden + Exportieren + Kann von hochgeladener Datei �bernommen werden + Wiki File + Wiki Files + Erstelltes Formular Formular Einschr�nkungen + Eintr�ge f�r dieses Formular Eintr�ge f�r dieses Formular Formular %form_name% Formular ausf�llen + Workflow %form_name% Auspr�gungen von %form_name% - Verfasser + Formular ausf�llen + OK + Template + Aktualisiertes Formular + %errorMsg% + Ung�ltiges Formular %errorMsg% + Wiki Forms + Wiki Form + Verfasser/in + URL des Bildes (Sie k�nnen die URL des Bildes, die im Webbrowser angezeigt wird, hier einf�gen) + Name des -zip- oder .tar.gz-Files ausw�hlen + Archiv importieren + Cut&Paste URL eines YouTube-Videos (http://www.youtube.com/....) Zustand + Wiki Einstellungen + Wiki FormPage + Wiki FormPages Stunde Stunden - Besucher + Importieren + User-IDs erstellen + Falls dieses K�stchen aktiviert ist, werden beim Import gegebenenfalls neue User-IDs erstellt. + Objekte ersetzen + Falls dieses K�stchen aktiviert ist, werden beim Import bereits bestehende Objekte ersetzt. Bei Nicht-Aktivieren wird beim Import eine neue Version des Objekts hinzugef�gt. + Wiki Seiten importieren + Datei f�r Upload ausw�hlen + Besucher/innen Besuche Index Zur Startseite + Eintr�ge + Sprache Zuletzt besuchte Seiten + Inhaltsverzeichnis der %pretty_plural% + Liste aller Arten von %pretty_plural% + Hinzuf�gen + Inhalt + Kopieren + Kopieren + Export + Archiv importieren Minute Minuten Monat Monaten - H�ufigsten Besucher - H�ufigst besuchten Seiten - Neuer Eintrag + Die h�ufigsten Besucher/innen + Am h�ufigsten besuchte Seiten + Name + Neue Seite + Neue Seite + Neue Seite erstellen ... Quelle Kurztext - Verst�ndigungen - Verwalten der Verst�ndigungen ... + Benachrichtigungen + Verwalten der Benachrichtigungen... ung�ltiger numerischer Wert - Ersteller + Wiki Objekt + Wiki Objekte + Abschnitt + Ersteller/in Kurzbeschreibung �nderungsdatum Name @@ -68,7 +127,7 @@ Ver�ffentlichungsdatum Inhalt Titel der Seite - Another item with the name '%value%' exists already in this folder + Another item with the name '%value%' exists already in this folder Art Typ der Seite Instanzattribute @@ -96,8 +155,7 @@ Sekunden Abonnieren Titel - Titel - + Titel Ungelesene Seiten Ansehen mehr... Index: openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml,v diff -u -N -r1.58 -r1.59 --- openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml 4 Jul 2010 16:47:35 -0000 1.58 +++ openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml 20 May 2011 09:52:45 -0000 1.59 @@ -2,19 +2,29 @@ Abstract + Add Admin + Administer all kind of %pretty_plural% Administer this package ... %time% ago + All items Back + By User Categories %errorMsg% + Configure Content Copy Entry Create new entry of type %type% Create this page in a different language day days Delete + Delete All + Delete really all? + Delete all %pretty_plural% of this instance + Delete all such items of this instances + Confirm delete? Delete this page ... Details Edit @@ -47,34 +57,55 @@ Start of Lecture Title Title of Lecture + Export Can be obtained from the name of the uploaded file + Wiki File + Wiki Files Created form Form Form Constraints + Entries for this form Entries for this form Form %form_name% Fill out Workflow %form_name% Instances of %form_name% + Fill out OK Template Updated form %errorMsg% Invalid Form %errorMsg% + Wiki Forms + Wiki Form Author HTTP Url of the Image (you might drag an image displayed by a web-browser here) Select the Name of a .zip or .tar.gz File Import Archive Cut&Paste URL of YouTube video (http://www.youtube.com/....) Assignee State + Wiki parameters + Wiki FormPage + Wiki FormPages hour hours + Import + Create user_ids + If checked, import will create new user_ids if necessary + Raplace objects + If checked, import will delete the object if it exists and create it new, otherwise import just adds a revision + Import Wiki Pages + Import file for upload Visitors Visits Index Go to the start page of this package ... + Instances + Language Last Visited Pages + Index of %pretty_plural% + List of all kind of %pretty_plural% Add Clear Content @@ -89,13 +120,18 @@ months Most Frequent Visitors Most Popular Pages + Name + New Page New Page Create a new page ... Source Teaser Notifications Manage notifications ... Invalid numeric value + Wiki Object + Wiki Objects + Section Creation User Creator Description @@ -108,27 +144,41 @@ Content Page Title %errorMsg% - Another item with the name '%value%' exists already in this folder + Another item with the name '%value%' exists already in this folder Page Order invalid; might only contain upper and lower case letters, underscore, digits and dots Type + XoWiki Page + Wiki Pages + Page Title Page Type Instance Attributes Page Instance + Wiki Page Instance + Wiki Page Instances Autonamed Entries + Wiki Page Template + Wiki Page Templates Value is not a valid party_id + Manage Permissions for Wiki: %package_name% + Manage Permissions for Page: %page_name% + Wiki Plain Page + Wiki Plain Pages Duration E.g. 9:16 means 9 minutes 16 seconds (if ffmpeg is installed and configured, it will get the value automatically) Keywords comma separated itunes keywords, e.g. salt, pepper, shaker, exciting Can be obtained from the name of the uploaded file Publication Date Subtitle + Podcast Item + Podcast Items Popular tags popular tags There is no page with name "%page_name%" available. The given page does not exist Please either change the existing portlets' name or the title of the xowiki page you want to add to the portal. A portlet with the title '%page_title%' already exists in this portal. + Wiki Published Recently Changed Pages Recently Changed Pages (by categories) @@ -143,10 +193,10 @@ second seconds To create a click, click on a page name + Size Subscribe Title - Title - + Title Unread Items View View page in original context %context% Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v diff -u -N -r1.431 -r1.432 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 16 May 2011 12:27:53 -0000 1.431 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 20 May 2011 09:52:45 -0000 1.432 @@ -11,7 +11,7 @@ # create classes for different kind of pages # ::xo::db::CrClass create Page -superclass ::xo::db::CrItem \ - -pretty_name "XoWiki Page" -pretty_plural "XoWiki Pages" \ + -pretty_name "#xowiki.Page_pretty_name#" -pretty_plural "#xowiki.Page_pretty_plural#" \ -table_name "xowiki_page" -id_column "page_id" \ -mime_type text/html \ -slots { @@ -55,19 +55,19 @@ } ::xo::db::CrClass create PlainPage -superclass Page \ - -pretty_name "XoWiki Plain Page" -pretty_plural "XoWiki Plain Pages" \ + -pretty_name "#xowiki.PlainPage_pretty_name#" -pretty_plural "#xowiki.PlainPage_pretty_plural#" \ -table_name "xowiki_plain_page" -id_column "ppage_id" \ -mime_type text/plain \ -form ::xowiki::PlainWikiForm ::xo::db::CrClass create File -superclass Page \ - -pretty_name "XoWiki File" -pretty_plural "XoWiki Files" \ + -pretty_name "#xowiki.File_pretty_name#" -pretty_plural "#xowiki.File_pretty_plural#" \ -table_name "xowiki_file" -id_column "file_id" \ -storage_type file \ -form ::xowiki::FileForm ::xo::db::CrClass create PodcastItem -superclass File \ - -pretty_name "Podcast Item" -pretty_plural "Podcast Items" \ + -pretty_name "#xowiki.PodcastItem_pretty_name#" -pretty_plural "#xowiki.PodcastItem_pretty_plural#" \ -table_name "xowiki_podcast_item" -id_column "podcast_item_id" \ -slots { ::xo::db::CrAttribute create pub_date \ @@ -84,7 +84,7 @@ -form ::xowiki::PodcastForm ::xo::db::CrClass create PageTemplate -superclass Page \ - -pretty_name "XoWiki Page Template" -pretty_plural "XoWiki Page Templates" \ + -pretty_name "#xowiki.PageTemplate_pretty_name#" -pretty_plural "#xowiki.PageTemplate_pretty_plural#" \ -table_name "xowiki_page_template" -id_column "page_template_id" \ -slots { ::xo::db::CrAttribute create anon_instances \ @@ -94,7 +94,7 @@ -form ::xowiki::PageTemplateForm ::xo::db::CrClass create PageInstance -superclass Page \ - -pretty_name "XoWiki Page Instance" -pretty_plural "XoWiki Page Instances" \ + -pretty_name "#xowiki.PageInstance_pretty_name#" -pretty_plural "#xowiki.PageInstance_pretty_plural#" \ -table_name "xowiki_page_instance" -id_column "page_instance_id" \ -slots { ::xo::db::CrAttribute create page_template \ @@ -108,13 +108,13 @@ -edit_form ::xowiki::PageInstanceEditForm ::xo::db::CrClass create Object -superclass PlainPage \ - -pretty_name "XoWiki Object" -pretty_plural "XoWiki Objects" \ + -pretty_name "#xowiki.Object_pretty_name#" -pretty_plural "#xowiki.Object_pretty_plural#" \ -table_name "xowiki_object" -id_column "xowiki_object_id" \ -mime_type text/plain \ -form ::xowiki::ObjectForm ::xo::db::CrClass create Form -superclass PageTemplate \ - -pretty_name "XoWiki Form" -pretty_plural "XoWiki Forms" \ + -pretty_name "#xowiki.Form_pretty_name#" -pretty_plural "#xowiki.Form_pretty_name#" \ -table_name "xowiki_form" -id_column "xowiki_form_id" \ -slots { ::xo::db::CrAttribute create form \ @@ -129,7 +129,7 @@ -form ::xowiki::FormForm ::xo::db::CrClass create FormPage -superclass PageInstance \ - -pretty_name "XoWiki FormPage" -pretty_plural "XoWiki FormPages" \ + -pretty_name "#xowiki.FormPage_pretty_name#" -pretty_plural "#xowiki.FormPage_pretty_name#" \ -table_name "xowiki_form_page" -id_column "xowiki_form_page_id" \ -slots { ::xo::db::CrAttribute create assignee \ Index: openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl 22 Nov 2010 12:19:19 -0000 1.4 +++ openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl 20 May 2011 09:52:45 -0000 1.5 @@ -558,5 +558,21 @@ } } } + + set v 0.138 + if {[apm_version_names_compare $from_version_name $v] == -1 && + [apm_version_names_compare $to_version_name $v] > -1} { + ns_log notice "-- upgrading to $v" + + foreach object_type {PlainPage Page File PodcastItem PageTemplate PageInstance Object Form FormPage} { + set pretty_name_key "#xowiki.${object_type}_pretty_name#" + set pretty_plural_key "#xowiki.${object_type}_pretty_plural#" + set xowiki_object_type "::xowiki::${object_type}" + db_dml i18_name " + update acs_object_types set pretty_name = :pretty_name_key, pretty_plural = :pretty_plural_key + where object_type = :xowiki_object_type + " + } + } } } Index: openacs-4/packages/xowiki/www/admin/import.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/import.tcl,v diff -u -N -r1.19 -r1.20 --- openacs-4/packages/xowiki/www/admin/import.tcl 22 Jun 2010 07:35:49 -0000 1.19 +++ openacs-4/packages/xowiki/www/admin/import.tcl 20 May 2011 09:52:45 -0000 1.20 @@ -16,14 +16,14 @@ -export {parent_id return_url} \ -html { enctype multipart/form-data } \ -form { - {upload_file:file(file) {html {size 30}} {label "Import file for upload"} } - {create_user_ids:integer(radio),optional {options {{yes 1} {no 0}}} {value 0} - {label "Create user_ids"} - {help_text "If checked, import will create new user_ids if necessary"} + {upload_file:file(file) {html {size 30}} {label "[_ xowiki.import_upload_file]"}} + {create_user_ids:integer(radio),optional {options {{#acs-admin.Yes# 1} {#acs-admin.No# 0}}} {value 0} + {label "[_ xowiki.import_create_user_ids]"} + {help_text "[_ xowiki.import_create_user_ids_helptxt]"} } - {replace:integer(radio),optional {options {{yes 1} {no 0}}} {value 0} - {label "Replace objects"} - {help_text "If checked, import will delete the object if it exists and create it new, otherwise import just adds a revision"} + {replace:integer(radio),optional {options {{#acs-admin.Yes# 1} {#acs-admin.No# 0}}} {value 0} + {label "[_ xowiki.import_replace]"} + {help_text "[_ xowiki.import_replace_helptxt]"} } {ok_btn:text(submit) {label "[_ acs-templating.HTMLArea_SelectUploadBtn]"} } @@ -73,6 +73,6 @@ set return_url [ns_queryget return_url ../] -set title "Import XoWiki Pages" +set title [_ xowiki.import_title] set context . ad_return_template Index: openacs-4/packages/xowiki/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/index.tcl,v diff -u -N -r1.25 -r1.26 --- openacs-4/packages/xowiki/www/admin/index.tcl 8 Feb 2009 12:58:56 -0000 1.25 +++ openacs-4/packages/xowiki/www/admin/index.tcl 20 May 2011 09:52:45 -0000 1.26 @@ -11,7 +11,8 @@ } set context [list] -set title "Administer all kind of [$object_type set pretty_plural]" +set pretty_plural [$object_type set pretty_plural] +set title #xowiki.admin_all_title# set object_types [$object_type object_types] set return_url [ns_conn url] @@ -20,37 +21,38 @@ lang::message::lookup "" xowiki.admin " " TableWidget t1 -volatile \ -actions [subst { - Action new -label "all pages" -url list + Action new -label #xowiki.All_pages# -url list Action new -label "[lang::message::lookup {} categories.Categories Categories]" \ -url $category_url - Action new -label parameters -url \ + Action new -label [_ acs-subsite.Parameters] -url \ [export_vars -base /shared/parameters {package_id return_url}] - Action new -label export -url export - Action new -label import -url import - Action new -label permissions -url [export_vars -base permissions {package_id}] + Action new -label [_ xowiki.export] -url export + Action new -label [_ xowiki.import] -url import + Action new -label [_ acs-subsite.Permissions] -url [export_vars -base permissions {package_id}] }] \ -columns { Field object_type -label [_ xowiki.page_type] - AnchorField instances -label Instances -html {align center} - AnchorField edit -CSSclass add-item-button -label "Add" -html {align center} - AnchorField delete -CSSclass delete-item-button -label "Delete All" \ - -html {align center onClick "return(confirm('Delete really all?'));"} + AnchorField instances -label [_ xowiki.instances] -html {align center} + AnchorField edit -CSSclass add-item-button -label [_ xowiki.add] -html {align center} + AnchorField delete -CSSclass delete-item-button -label [_ xowiki.delete_all] \ + -html {align center onClick "return(confirm('#xowiki.delete_all_confirm#'));"} } set base [::$package_id package_url] foreach object_type $object_types { set return_url [export_vars -base ${base}admin {object_type}] set add_title "" set add_href "" + set pretty_plural [$object_type pretty_plural] if {[catch {set n [db_list count [$object_type instance_select_query \ -folder_id [::$package_id set folder_id] \ -count 1 -with_subtypes false]]}]} { set n - - set delete_title "Delete all such items of this instance" + set delete_title [_ xowiki.delete_all_items] } else { set add_title [_ xotcl-core.add [list type [$object_type pretty_name]]] set add_href [$package_id make_link -with_entities 0 $package_id edit-new object_type return_url autoname] - set delete_title "Delete all [$object_type pretty_plural] of this instance" + set delete_title [_ xowiki.delete_all_instances] } t1 add \ -object_type $object_type \ Index: openacs-4/packages/xowiki/www/admin/list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/list.tcl,v diff -u -N -r1.31 -r1.32 --- openacs-4/packages/xowiki/www/admin/list.tcl 27 Jan 2011 07:39:35 -0000 1.31 +++ openacs-4/packages/xowiki/www/admin/list.tcl 20 May 2011 09:52:45 -0000 1.32 @@ -20,14 +20,16 @@ set per_type 0 set supertype ::xowiki::Page set object_types [$supertype object_types] - set page_title "List of all kind of [$supertype set pretty_plural]" + set pretty_plural [$supertype set pretty_plural] + set page_title [_ xowiki.listing_title_all] set with_subtypes true set object_type $supertype set with_children true } else { set per_type 1 set object_types [list $object_type] - set page_title "Index of [$object_type set pretty_plural]" + set pretty_plural [$object_type set pretty_plural] + set page_title [_ xowiki.listing_title] set with_subtypes false set with_children true } @@ -60,8 +62,8 @@ -actions $actions \ -columns { BulkAction objects -id name -actions { - Action new -label export -tooltip export -url export - Action new -label delete -tooltip delete -url bulk-delete + Action new -label [_ xowiki.export] -tooltip [_ xowiki.export] -url export + Action new -label [_ xowiki.delete] -tooltip [_ xowiki.delete] -url bulk-delete } AnchorField edit -CSSclass edit-item-button -label "" -html {style "padding: 0px;"} if {$::individual_permissions} { @@ -79,10 +81,10 @@ AnchorField name -label [_ xowiki.Page-name] -orderby name -html {style "padding: 2px;"} AnchorField title -label [_ xowiki.Page-title] -orderby title Field object_type -label [_ xowiki.page_type] -orderby object_type -html {style "padding: 2px;"} - Field size -label "Size" -orderby size -html {align right style "padding: 2px;"} + Field size -label [_ xowiki.Size] -orderby size -html {align right style "padding: 2px;"} Field last_modified -label [_ xowiki.Page-last_modified] -orderby last_modified - Field mod_user -label "By User" -orderby mod_user - AnchorField delete -CSSclass delete-item-button -label "" ;#-html {onClick "return(confirm('Confirm delete?'));"} + Field mod_user -label [_ xowiki.By_user] -orderby mod_user + AnchorField delete -CSSclass delete-item-button -label "" ;#-html {onClick "return(confirm('#xowiki.delete_confirm#'));"} } foreach {att order} [split $orderby ,] break Index: openacs-4/packages/xowiki/www/admin/permissions.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/permissions.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/xowiki/www/admin/permissions.tcl 3 Sep 2007 21:07:53 -0000 1.3 +++ openacs-4/packages/xowiki/www/admin/permissions.tcl 20 May 2011 09:52:45 -0000 1.4 @@ -13,11 +13,14 @@ set page [::xo::db::CrClass get_instance_from_db -item_id $item_id] $page volatile set object_id $item_id - set page_title "Manage Permissions for Page: [$page name]" + set page_name [$page name] + set page_title [_ xowiki.permissions_manage_page] set return_url [$package_id query_parameter return_url [$package_id package_url]admin/list] } else { set object_id $package_id - set page_title "Manage Permissions for Package [apm_instance_name_from_id $package_id]" + set package_name [apm_instance_name_from_id $package_id] + set package_name [$package_id get_parameter PackageTitle $package_name] + set page_title [_ xowiki.permissions_manage_package] set return_url [$package_id query_parameter return_url [$package_id package_url]admin] }