5 files changed, 61 insertions, 4 deletions

diff --git a/config/asset_licenses.yml b/config/asset_licenses.yml
new file mode 100644
index 0000000..5cf377f
--- /dev/null
+++ b/config/asset_licenses.yml
@@ -0,0 +1,25 @@
+# config/asset_licenses.yml
+cc0:
+  url: "https://creativecommons.org/publicdomain/zero/1.0/"
+  requires_attribution: false
+  style: license
+cc_by_4:
+  url: "https://creativecommons.org/licenses/by/4.0/"
+  requires_attribution: true
+  style: license
+cc_by_sa_4:
+  url: "https://creativecommons.org/licenses/by-sa/4.0/"
+  requires_attribution: true
+  style: license
+public_domain:
+  url:
+  requires_attribution: false
+  style: note
+used_with_permission:
+  url:
+  requires_attribution: false
+  style: note
+own_work:
+  url:
+  requires_attribution: false
+  style: note
diff --git a/config/initializers/csp_log.rb b/config/initializers/csp_log.rb
new file mode 100644
index 0000000..1dde9c4
--- /dev/null
+++ b/config/initializers/csp_log.rb
@@ -0,0 +1,4 @@
+# CSP violation reports get their own file, independent of config.logger.
+CSP_LOGGER = Rails.env.production? ?
+  ActiveSupport::Logger.new(Rails.root.join("log", "csp_violations.log")) :
+  Rails.logger
diff --git a/config/locales/de.yml b/config/locales/de.yml
index f64f6cd..21c8ebf 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -116,3 +116,17 @@ de:
     revision_created: "angelegt am %{date} von %{actor}"
     revision_published: "veröffentlicht am %{date} von %{actor}"
     revision_restored: "wiederhergestellt am %{date} von %{actor}"
+
+  open_gallery: "Gallerie anzeigen"
+  asset_licenses:
+    cc0: "CC0"
+    cc_by_4: "CC BY 4.0"
+    cc_by_sa_4: "CC BY-SA 4.0"
+    public_domain: "Gemeinfrei"
+    used_with_permission: "Mit Genehmigung verwendet"
+    own_work: "Eigenes Werk"
+
+  asset_credits:
+    photo: "Foto %{name}"
+    by: "von %{creator}"
+    licensed_under: "Lizenziert unter %{license}"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8a8acc1..1afcf21 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -68,3 +68,17 @@ en:
     revision_created: "created %{date} by %{actor}"
     revision_published: "published %{date} by %{actor}"
     revision_restored: "restored %{date} by %{actor}"
+
+  open_gallery: "Open gallery"
+  asset_licenses:
+    cc0: "CC0"
+    cc_by_4: "CC BY 4.0"
+    cc_by_sa_4: "CC BY-SA 4.0"
+    public_domain: "Public domain"
+    used_with_permission: "Used with permission"
+    own_work: "Own work"
+
+  asset_credits:
+    photo: "Photo %{name}"
+    by: "by %{creator}"
+    licensed_under: "Licensed under %{license}"
diff --git a/config/routes.rb b/config/routes.rb
index 743b46e..6ddf48c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -109,11 +109,11 @@ Cccms::Application.routes.draw do
 
     resource :session
 
-    get  'rss/updates',         :to => 'rss#updates', :as => :rss
-    get  'rss/updates.:format', :to => 'rss#updates', :as => :rss_feed,
+    get  'rss/updates',         :to => 'rss#updates', :as => :rss,      :defaults => { :format => :xml }
+    get  'rss/updates.:format', :to => 'rss#updates', :as => :rss_feed, :defaults => { :format => :xml },
            :constraints => { :format => /xml|rdf/ }
-    get  'rss/tags/:tag/updates',         :to => 'rss#tag_updates', :as => :rss_tag
-    get  'rss/tags/:tag/updates.:format', :to => 'rss#tag_updates', :as => :rss_tag_feed,
+    get  'rss/tags/:tag/updates',         :to => 'rss#tag_updates', :as => :rss_tag, :defaults => { :format => :xml }
+    get  'rss/tags/:tag/updates.:format', :to => 'rss#tag_updates', :as => :rss_tag_feed, :defaults => { :format => :xml },
            :constraints => { :format => /xml/ }
 
     match 'galleries/*page_path' => 'content#render_gallery', :via => :get