* Edited messages

* Removed obsolete lines from app.properties
 * Re-enabled setting of res.skinpath in HopObject.onRequest
 * Fixed images collection in Tag prototype

code/Admin/Admin.js

@@ -481,7 +481,7 @@ Admin.prototype.blockPrivateSites = function() {
             var recipient = site.email ? site.email : site.creator.email;
             warning.addTo(recipient);
             warning.setFrom(root.sys_email);
-            warning.setSubject(gettext("Attention! Your site {0} will soon be blocked!", site.title));
+            warning.setSubject(gettext("Warning! Your site {0} soon will be blocked!", site.title));
             var sp = new Object();
             sp.site = site.alias;
             sp.url = site.href();
@@ -546,7 +546,7 @@ Admin.prototype.deleteInactiveSites = function() {
             var recipient = site.email ? site.email : site.creator.email;
             warning.addTo(recipient);
             warning.setFrom(root.sys_email);
-            warning.setSubject(gettext("Attention! Your site {0} will soon be deleted!", site.title));
+            warning.setSubject(gettext("Warning! Your site {0} soon will be deleted!", site.title));
             var sp = new Object();
             sp.site = site.alias;
             sp.url = site.href();

code/Comment/Comment.js

@@ -72,7 +72,7 @@ Comment.prototype.edit_action = function() {
    
    res.handlers.parent = this.parent;
    res.data.action = this.href(req.action);
-   res.data.title = gettext("Edit comment to story {0}", 
+   res.data.title = gettext("Edit comment to story: {0}", 
          res.handlers.story.getTitle());
    res.data.body = this.renderSkinAsString("Comment#edit");
    this.site.renderSkin("Site#page");

code/Files/Files.js

@@ -56,7 +56,7 @@ Files.prototype.create_action = function() {
    }
    
    res.data.action = this.href(req.action);
-   res.data.title = gettext("Add a file to {0}", this._parent.title);
+   res.data.title = gettext("Add file to {0}", this._parent.title);
    res.data.body = file.renderSkinAsString("File#edit");
    this._parent.renderSkin("Site#page");
    return;

code/Global/i18n.js

@@ -31,3 +31,12 @@ markgettext("Referrers");
 markgettext("Skins");
 markgettext("Stories");
 markgettext("Tags");
+
+markgettext("Edit");
+markgettext("Delete");
+markgettext("Show");
+markgettext("Close");
+markgettext("Publish");
+markgettext("Hide");
+
+markgettext('"ÄÖÜß"');

code/HopObject/HopObject.js

@@ -74,7 +74,7 @@ HopObject.prototype.onRequest = function() {
    }
 
    res.handlers.layout = res.handlers.site.layout || new Layout;
-   //res.skinpath = res.handlers.layout.getSkinPath();
+   res.skinpath = res.handlers.layout.getSkinPath();
 
    res.meta.values = {};
    res.handlers.site.renderSkinAsString("Site#values");

code/Membership/Membership.js

@@ -63,7 +63,7 @@ Membership.prototype.edit_action = function() {
    }
    
    res.data.action = this.href(req.action);
-   res.data.title = gettext("Edit membership: {0}", this.name);
+   res.data.title = gettext("Edit membership {0}", this.name);
    res.data.body = this.renderSkinAsString("Membership#edit");
    this.site.renderSkin("Site#page");
    return;
@@ -109,7 +109,7 @@ Membership.prototype.contact_action = function() {
    }
    
    res.data.action = this.href(req.action);
-   res.data.title = gettext('Contact user "{0}"', this.name);
+   res.data.title = gettext('Contact user {0}', this.name);
    res.data.body = this.renderSkinAsString("Membership#contact");
    this.site.renderSkin("Site#page");
    return;

code/Skin/Skin.js

@@ -79,7 +79,7 @@ Skin.prototype.edit_action = function() {
       }
    }
    res.data.action = this.href(req.action);
-   res.data.title = gettext('Edit {0}.{1} skin of "{2}"', this.prototype, 
+   res.data.title = gettext('Edit skin {0}.{1} of {2}', this.prototype, 
          this.name, res.handlers.site.title);
    res.data.body = this.renderSkinAsString("Skin#edit");
    res.handlers.skins.renderSkin("Skins#page");
@@ -167,7 +167,7 @@ Skin.prototype.restore_action = function() {
    }
 
    res.data.action = this.href(req.action);
-   res.data.title = gettext("Confirm restore of {0}", this);
+   res.data.title = gettext("Confirm restoration of {0}", this);
    res.data.body = this.renderSkinAsString("HopObject#confirm", {
       text: gettext('You are about to restore {0}.', this)
    });
@@ -218,9 +218,9 @@ Skin.prototype.compare_action = function() {
          res.data.diff = res.pop();
       }
    }
+   res.data.title = gettext("Compare versions of skin {0}.{1}", 
+         this.prototype, this.name);
    res.data.body = this.renderSkinAsString("Skin#compare");
-   res.data.title = gettext("Diffs for {0}/{1}.skin of layout {2}", 
-         this.prototype, this.name, res.handlers.layout.title);
    res.handlers.skins.renderSkin("Skins#page");
    return;
 };

code/Skin/Skin.skin

@@ -46,8 +46,7 @@ else
 </span>
 
 <% #compare %>
-<h3>Comparing <% skin.prototype %>.<% skin.name %> of layout '<% layout.title %>'
-with the original version:</h3>
+<h3><% response.title %></h3>
 
 <table class="diff" cellspacing="0" cellpadding="0">
 <tr>

code/Skins/Skins.js

@@ -143,10 +143,10 @@ Skins.prototype.create_action = function() {
       }
    } else {
       if (skin.getSource()) {
-         res.data.title = gettext("Edit skin {0}.{1} of layout {2}", 
-               skin.prototype, skin.name, res.handlers.layout.name);
+         res.data.title = gettext("Edit skin {0}.{1} of {2}", 
+               skin.prototype, skin.name, res.handlers.site.title);
       } else {
-         res.data.title = gettext('Create a custom skin of "{0}"', 
+         res.data.title = gettext('Create a custom skin of {0}', 
                res.handlers.site.title);
       }
    }
@@ -253,7 +253,7 @@ Skins.prototype.getCustomSkins = function() {
 };
 
 Skins.getSummary = function(prefix, prototype, name) {
-   return gettext("Description of skin " + prototype + "." + name);
+   return gettext("Description of skin {0}", prototype + "." + name);
    var key = prefix + "." + prototype;
    name && (key += "." + name);
    var languages = new Array("en");

code/Tag/Tag.properties

@@ -50,6 +50,6 @@ images = collection(TagHub)
 images.local = id
 images.foreign = tag_id
 images.filter.additionalTables = image
-images.filter = image.site_id = ${site_id} and tagged_type = 'Image' \
-      and image.id = tagged_id
+images.filter = image.site_id = ${site_id} and image.parent_type = 'Site' \
+      and tagged_type = 'Image' and image.id = tagged_id
 images.order = image.created desc

code/app.properties

@@ -29,14 +29,8 @@ charset = UTF8
 skinCharset = UTF8
 requestTimeout = 300 
 
-## Enable this if Root should become extent of Site
-#rootId = 1
-
 ## uncomment to set base for application generated URLs, if necessary.
-baseURI = http://localhost:8080/antville
-
-## description of this app (e.g. used in app manager)
-_description = An easy to maintain and use weblog hosting system
+#baseURI = http://localhost:8080/antville
 
 ## directory that contains static contents (images, files)
 staticPath = apps/antville/static/