From: zapata Date: Thu, 20 Feb 2003 16:06:30 +0000 (+0000) Subject: preliminary support for translation + misc. fixes X-Git-Tag: BEFORE_MERGE_1_1~262 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=474eddfb456e99490316f31c1bc7ac4481a98960;p=mir.git preliminary support for translation + misc. fixes --- diff --git a/bundles/admin_en.properties b/bundles/admin_en.properties index 632df3d5..a9c32d4a 100755 --- a/bundles/admin_en.properties +++ b/bundles/admin_en.properties @@ -1,6 +1,6 @@ ########## admin ########## # language: english -# $Id: admin_en.properties,v 1.33 2003/01/18 15:54:30 zapata Exp $ +# $Id: admin_en.properties,v 1.34 2003/02/20 16:06:30 zapata Exp $ languagename=English @@ -152,9 +152,17 @@ content.create_date=Date content.published=published content.comments=Comments +content.family=Children & Parents +content.children=Children +content.viewchildren=view +content.parent=Parent +content.viewparent=view +content.clearparent=de-select +content.selectparent=select contentlist.htmltitle=Articles -contentlist.comments=comments +contentlist.comments=Comments +contentlist.select=Select # language language.htmltitle=Language diff --git a/etc/log4j.properties b/etc/log4j.properties index 712620fa..32d6afb1 100755 --- a/etc/log4j.properties +++ b/etc/log4j.properties @@ -1,14 +1,27 @@ log4j.rootLogger= WARN, A1 log4j.logger.Servlet= INFO, ServletA +log4j.logger.Database= INFO, DatabaseA +log4j.logger.Entity= INFO, EntityA log4j.logger.Media= INFO, MediaA log4j.logger.Producer= INFO, ProducerA log4j.logger.ServletModule= INFO, ServletModuleA log4j.logger.Module= INFO, ModuleA +log4j.logger.Localizer= INFO, LocalizerA log4j.appender.A1=org.apache.log4j.ConsoleAppender log4j.appender.A1.layout=org.apache.log4j.PatternLayout log4j.appender.A1.layout.ConversionPattern=%d [%p] %c %x %m%n +log4j.appender.DatabaseA=org.apache.log4j.RollingFileAppender +log4j.appender.DatabaseA.File=${log.home}/database.log +log4j.appender.DatabaseA.layout=org.apache.log4j.PatternLayout +log4j.appender.DatabaseA.layout.ConversionPattern=%d [%p] %c %x %m%n + +log4j.appender.EntityA=org.apache.log4j.RollingFileAppender +log4j.appender.EntityA.File=${log.home}/entity.log +log4j.appender.EntityA.layout=org.apache.log4j.PatternLayout +log4j.appender.EntityA.layout.ConversionPattern=%d [%p] %c %x %m%n + log4j.appender.ServletA=org.apache.log4j.RollingFileAppender log4j.appender.ServletA.File=${log.home}/servlet.log log4j.appender.ServletA.layout=org.apache.log4j.PatternLayout @@ -34,4 +47,8 @@ log4j.appender.ModuleA.File=${log.home}/module.log log4j.appender.ModuleA.layout=org.apache.log4j.PatternLayout log4j.appender.ModuleA.layout.ConversionPattern=%d [%p] %c %x %m%n +log4j.appender.LocalizerA=org.apache.log4j.RollingFileAppender +log4j.appender.LocalizerA.File=${log.home}/localizer.log +log4j.appender.LocalizerA.layout=org.apache.log4j.PatternLayout +log4j.appender.LocalizerA.layout.ConversionPattern=%d [%p] %c %x %m%n diff --git a/templates/admin/content.template b/templates/admin/content.template index a242e7ad..84cf9dff 100755 --- a/templates/admin/content.template +++ b/templates/admin/content.template @@ -8,12 +8,13 @@ - + +
- - + + @@ -23,14 +24,14 @@   - - ${lang("content.comments")} + + ${lang("content.comments")} ${lang("content.published")} : - checked> - + checked> + @@ -43,7 +44,7 @@ ${lang("content.import_date")}: - ${data.date} + ${article.date}   @@ -52,7 +53,7 @@ ${lang("content.lastchange_date")}: - ${utility.encodeHTML(data.webdb_lastchange)}
+ ${utility.encodeHTML(article.webdb_lastchange)}
  @@ -62,7 +63,7 @@ ${lang("content.create_date")}: - ${utility.encodeHTML(data.webdb_create)}

${lang("edit")} (yyyy-mm-dd [HH:mm]): + ${utility.encodeHTML(article.webdb_create)}

${lang("edit")} (yyyy-mm-dd [HH:mm]):
  @@ -80,15 +81,15 @@ @@ -96,8 +97,8 @@ @@ -111,7 +112,7 @@ ${lang("content.title")}:  -
+
@@ -120,8 +121,8 @@ - - + + @@ -130,7 +131,7 @@ - + @@ -140,7 +141,7 @@ -
+
@@ -151,8 +152,8 @@ - - + + @@ -162,8 +163,8 @@ - - + + @@ -173,7 +174,7 @@ - + @@ -183,13 +184,13 @@
${lang("content.html")} - checked>  + checked>  - + @@ -198,7 +199,7 @@ ${lang("content.internal")} - + @@ -206,98 +207,130 @@     - + + + + + ${lang("content.family")} + + + + + ${lang("content.parent")}: + + + + ${utility.encodeHTML(article.parent.title)} + ${lang("content.viewparent")} | + ${lang("content.clearparent")} | + + ${lang("content.selectparent")} + + + + + ${lang("content.children")}: + + + ${lang("content.viewchildren")} + + + ${lang("content.attachments")} - - - - - ${lang("content.images")}: - - - edit - ${lang("delete")} - - - - - - ${lang("content.media")}: - - - ${lang("content.addimage")} - - - - - - ${lang("content.audio")}: - - - edit - ${lang("delete")} - - - - - - ${lang("content.media")}: - - - ${lang("content.addaudio")} - - - - - - ${lang("content.video")}: - - - edit - ${lang("delete")} - - - - - - ${lang("content.media")}: - - - ${lang("content.addvideo")} - - - + + + + ${lang("content.images")}: + + + edit + ${lang("delete")} + + + + + + ${lang("content.images")}: + + + ${lang("content.addimage")} + + + + + + + ${lang("content.audio")}: + + + edit + ${lang("delete")} + + + + + + ${lang("content.audio")}: + + + ${lang("content.addaudio")} + + + + + + + ${lang("content.video")}: + + + edit + ${lang("delete")} + + + + + + ${lang("content.video")}: + + + ${lang("content.addvideo")} + + + ${lang("content.other")}: edit - ${lang("delete")} + ${lang("delete")} - ${lang("content.media")}: + ${lang("content.other")}: - ${lang("content.addother")} + ${lang("content.addother")} + + - + + diff --git a/templates/admin/contentlist.template b/templates/admin/contentlist.template index 94060847..bfae89c5 100755 --- a/templates/admin/contentlist.template +++ b/templates/admin/contentlist.template @@ -1,120 +1,207 @@ - - - ${config["Mir.Name"]} | ${lang("contentlist.htmltitle")} - - + + if selectarticleurl is set, this list is used to select an article + - + + + + + + + - - + + + ${config["Mir.Name"]} | ${lang("contentlist.htmltitle")} + + - -
- - - + -

- -

- + + + + + + + + + + + + + + + + + + + + + + + + +
for valuesearch in fieldpublishedarticle typeorder
+ + + + + + + + + +
+ + - - - - - - - - - - - class="list1"class="list2"> - - - - - - - - -
- ${lang("content.creationdate")}
- ${lang("content.modificationdate")}
- ${lang("content.status")}		 - ${lang("content.type")} - ${lang("content.title")}
- ${lang("content.creator")}		 - ${lang("content.comment")} 
- - ${entry.creationdate.formatted["dd.MM.yyyy HH:mm"]}
- ${entry.changedate.formatted["dd.MM.yyyy HH:mm"]}
- F-H- - - 		- - - - ${lang("articletypes." + entry.article_type.name)} - - - ${entry.title} -
- ${entry.creator}
+ - - - [${op}] - - - - - [${op}] - - - - - - - | - - ${lang("edit")} | - ${lang("contentlist.comments")} - - 		class="list3"class="list4" valign="top"> - - ${entry.comment}  - - ${lang("delete")} - -
${count} ${lang("records")} - / ${lang("show_from_to", from, to)}
- -

- -

+ + +
+ + + + +

+ +

+ + -
- -

- - - - ${lang("list.previous")} - - - ${lang("list.next")} - - + + + + + + + - -

${lang("no_matches_found")}

- + - - + + class="list1"class="list2"> + + + + + + + + + +
+ ${lang("content.creationdate")}
+ ${lang("content.modificationdate")}
+ ${lang("content.status")} + 		+ ${lang("content.type")} - ${lang("content.title")}
+ ${lang("content.creator")} + 		+ ${lang("content.comment")} +  
+ + ${entry.creationdate.formatted["dd.MM.yyyy HH:mm"]}
+ ${entry.changedate.formatted["dd.MM.yyyy HH:mm"]}
+ F-H- + + 		+ + + + ${lang("articletypes." + entry.article_type.name)} - + + ${entry.title} +
+ ${entry.creator}
+ + + + + [${op}] + + + + + [${op}] + + + + + + + | + + ${lang("edit")} | + ${lang("contentlist.comments")} (${entry.commentcount}) + + + ${lang("contentlist.select")} + + + + 		class="list3"class="list4" valign="top"> + + ${entry.comment}  + + + + + ${lang("delete")} + + +
+ ${count} ${lang("records")} / ${lang("show_from_to", from, to)} +
+ + + +

+ +

+ + + +

+ + + + ${lang("list.previous")} + + + ${lang("list.next")} + + + + +

${lang("no_matches_found")}

+
+ + + diff --git a/templates/admin/start_admin.template b/templates/admin/start_admin.template index c35ba2c1..e3bd3378 100755 --- a/templates/admin/start_admin.template +++ b/templates/admin/start_admin.template @@ -17,7 +17,7 @@ ${lang("start.openpostings.title")}

- +  ${lang("edit")}

@@ -83,16 +83,15 @@

- + ${lang("start.content.search")}: - - +