From: Tom Hughes <tom@compton.nu>
Date: Wed, 6 Jun 2018 13:51:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1892'
X-Git-Tag: live~2963
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ba9a00b10cc8a075a5a4090a1601e3d3b72b2ec1?hp=57d3b3af55a0bb37eb964aa75a9f1549df9a771c

Merge remote-tracking branch 'upstream/pull/1892'
---

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 2f6ea0087..362cfcb32 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -67,7 +67,7 @@ Metrics/AbcSize:
 # Offense count: 41
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 241
+  Max: 247
 
 # Offense count: 12
 # Configuration parameters: CountBlocks.
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index eb7cbf845..cef2efbb2 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1889,14 +1889,14 @@ tr.turn:hover {
   display: none;
 }
 
-.message-read .message-buttons {
+.messages-show .message-buttons {
   margin-top: $lineheight;
   margin-bottom: $lineheight * 1.5;
   padding-top: $lineheight;
   border-top: 1px solid $lightgrey;
 }
 
-.message-read .buttons .mark-unread-button {
+.messages-show .buttons .mark-unread-button {
   border-radius: 0;
 }
 
diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index c0b974c5e..f2c11fc74 100644
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -155,8 +155,8 @@ class DiaryEntryController < ApplicationController
 
       if user
         @entries = user.diary_entries
-        @title = I18n.t("diary_entry.feed.user.title", :user => user.display_name)
-        @description = I18n.t("diary_entry.feed.user.description", :user => user.display_name)
+        @title = t("diary_entry.feed.user.title", :user => user.display_name)
+        @description = t("diary_entry.feed.user.description", :user => user.display_name)
         @link = url_for :controller => "diary_entry", :action => "list", :display_name => user.display_name, :host => SERVER_URL, :protocol => SERVER_PROTOCOL
       else
         head :not_found
@@ -167,12 +167,12 @@ class DiaryEntryController < ApplicationController
 
       if params[:language]
         @entries = @entries.where(:language_code => params[:language])
-        @title = I18n.t("diary_entry.feed.language.title", :language_name => Language.find(params[:language]).english_name)
-        @description = I18n.t("diary_entry.feed.language.description", :language_name => Language.find(params[:language]).english_name)
+        @title = t("diary_entry.feed.language.title", :language_name => Language.find(params[:language]).english_name)
+        @description = t("diary_entry.feed.language.description", :language_name => Language.find(params[:language]).english_name)
         @link = url_for :controller => "diary_entry", :action => "list", :language => params[:language], :host => SERVER_URL, :protocol => SERVER_PROTOCOL
       else
-        @title = I18n.t("diary_entry.feed.all.title")
-        @description = I18n.t("diary_entry.feed.all.description")
+        @title = t("diary_entry.feed.all.title")
+        @description = t("diary_entry.feed.all.description")
         @link = url_for :controller => "diary_entry", :action => "list", :host => SERVER_URL, :protocol => SERVER_PROTOCOL
       end
     end
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 99884295b..d14605692 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -26,7 +26,7 @@ class MessagesController < ApplicationController
         if @message.save
           flash[:notice] = t ".message_sent"
           Notifier.message_notification(@message).deliver_now
-          redirect_to :action => "inbox", :display_name => current_user.display_name
+          redirect_to :action => :inbox
         end
       end
     end
@@ -56,14 +56,14 @@ class MessagesController < ApplicationController
       redirect_to :controller => "user", :action => "login", :referer => request.fullpath
     end
   rescue ActiveRecord::RecordNotFound
-    @title = t "message.no_such_message.title"
+    @title = t "messages.no_such_message.title"
     render :action => "no_such_message", :status => :not_found
   end
 
   # Show a message
   def show
     @title = t ".title"
-    @message = Message.find(params[:message_id])
+    @message = Message.find(params[:id])
 
     if @message.recipient == current_user || @message.sender == current_user
       @message.message_read = true if @message.recipient == current_user
@@ -73,26 +73,18 @@ class MessagesController < ApplicationController
       redirect_to :controller => "user", :action => "login", :referer => request.fullpath
     end
   rescue ActiveRecord::RecordNotFound
-    @title = t "message.no_such_message.title"
+    @title = t "messages.no_such_message.title"
     render :action => "no_such_message", :status => :not_found
   end
 
   # Display the list of messages that have been sent to the user.
   def inbox
     @title = t ".title"
-    if current_user && params[:display_name] == current_user.display_name
-    else
-      redirect_to :action => "inbox", :display_name => current_user.display_name
-    end
   end
 
   # Display the list of messages that the user has sent to other users.
   def outbox
     @title = t ".title"
-    if current_user && params[:display_name] == current_user.display_name
-    else
-      redirect_to :action => "outbox", :display_name => current_user.display_name
-    end
   end
 
   # Set the message as being read or unread.
@@ -108,10 +100,10 @@ class MessagesController < ApplicationController
     @message.message_read = message_read
     if @message.save && !request.xhr?
       flash[:notice] = notice
-      redirect_to :action => "inbox", :display_name => current_user.display_name
+      redirect_to :action => :inbox
     end
   rescue ActiveRecord::RecordNotFound
-    @title = t "message.no_such_message.title"
+    @title = t "messages.no_such_message.title"
     render :action => "no_such_message", :status => :not_found
   end
 
@@ -126,11 +118,11 @@ class MessagesController < ApplicationController
       if params[:referer]
         redirect_to params[:referer]
       else
-        redirect_to :action => "inbox", :display_name => current_user.display_name
+        redirect_to :action => :inbox
       end
     end
   rescue ActiveRecord::RecordNotFound
-    @title = t "message.no_such_message.title"
+    @title = t "messages.no_such_message.title"
     render :action => "no_such_message", :status => :not_found
   end
 
diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index d21092881..6cbe302d6 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -120,7 +120,7 @@ class SiteController < ApplicationController
     append_content_security_policy_directives(
       :connect_src => %w[*],
       :img_src => %w[* blob:],
-      :script_src => %w[dev.virtualearth.net *.wikipedia.org www.wikidata.org 'unsafe-eval'],
+      :script_src => %w[dev.virtualearth.net *.wikipedia.org www.wikidata.org services.arcgisonline.com serviceslab.arcgisonline.com 'unsafe-eval'],
       :style_src => %w['unsafe-inline']
     )
 
diff --git a/app/views/browse/not_found.html.erb b/app/views/browse/not_found.html.erb
index 5fe22a68a..3c4e8a4c8 100644
--- a/app/views/browse/not_found.html.erb
+++ b/app/views/browse/not_found.html.erb
@@ -1,12 +1,4 @@
-<%
-  browse_not_found_type = {
-    'node' => I18n.t('.type.node'),
-    'way' => I18n.t('.type.way'),
-    'relation' => I18n.t('.type.relation'),
-    'changeset' => I18n.t('.type.changeset'),
-  };
-%>
-
 <h2>
-    <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-    <%= t '.sorry', :type=> browse_not_found_type[@type] , :id => params[:id] %></h2>
+  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+  <%= t ".sorry", :type => t(".type.#{@type}"), :id => params[:id] %>
+</h2>
diff --git a/app/views/browse/timeout.html.erb b/app/views/browse/timeout.html.erb
index de102e60f..e6dd7b68d 100644
--- a/app/views/browse/timeout.html.erb
+++ b/app/views/browse/timeout.html.erb
@@ -1,12 +1,4 @@
-<%
-  browse_timeout_type = {
-    'node' => I18n.t('.type.node'),
-    'way' => I18n.t('.type.way'),
-    'relation' => I18n.t('.type.relation'),
-    'changeset' => I18n.t('.type.changeset'),
-  };
-%>
 <div class="browse-section">
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <%= t '.sorry', :type=> browse_timeout_type[@type] , :id => params[:id] %>
+  <%= t '.sorry', :type => t(".type.#{@type}"), :id => params[:id] %>
 </div>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index a5ab460ce..8411fefdb 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -64,7 +64,7 @@
         </a>
         <ul class='dropdown-menu'>
           <li>
-            <%= link_to inbox_path(:display_name => current_user.display_name) do %>
+            <%= link_to inbox_messages_path do %>
               <span class='count-number'><%= number_with_delimiter(current_user.new_messages.size) %></span>
               <%= t('user.view.my messages') %>
             <% end %>
diff --git a/app/views/messages/inbox.html.erb b/app/views/messages/inbox.html.erb
index b51815b4c..03e01915e 100644
--- a/app/views/messages/inbox.html.erb
+++ b/app/views/messages/inbox.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :heading do %>
-  <h2><%= t '.my_inbox'%>/<%= link_to t('.outbox'), outbox_path(current_user.display_name) %></h2>
+  <h2><%= t '.my_inbox'%>/<%= link_to t('.outbox'), outbox_messages_path %></h2>
 <% end %>
 
   <h4><%= render :partial => "message_count" %></h4>
diff --git a/app/views/messages/new.html.erb b/app/views/messages/new.html.erb
index 73d0ede2a..e33bc176d 100644
--- a/app/views/messages/new.html.erb
+++ b/app/views/messages/new.html.erb
@@ -16,7 +16,7 @@
     </div>
     <div class='buttons'>
       <%= submit_tag t('.send_button') %>
-      <%= link_to t('.back_to_inbox'), inbox_path(current_user), :class => 'deemphasize button' %>
+      <%= link_to t('.back_to_inbox'), inbox_messages_path, :class => 'deemphasize button' %>
     </div>
   </fieldset>
 <% end %>
diff --git a/app/views/messages/outbox.html.erb b/app/views/messages/outbox.html.erb
index c9688de51..199cfdc49 100644
--- a/app/views/messages/outbox.html.erb
+++ b/app/views/messages/outbox.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :heading do %>
-  <h2><%= raw(t '.my_inbox', :inbox_link => link_to(t('.inbox'), inbox_path(current_user.display_name))) %>/<%= t'.outbox' %></h2>
+  <h2><%= raw(t '.my_inbox', :inbox_link => link_to(t('.inbox'), inbox_messages_path)) %>/<%= t'.outbox' %></h2>
 <% end %>
 
 <h4><%= t '.messages', :count => current_user.sent_messages.size %></h4>
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index 4d2f6f6ce..934cfb99a 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -36,5 +36,5 @@
 
 <% end %>
 
-  <%= link_to t('.back'), outbox_path(current_user), :class => "button deemphasize" %>
+  <%= link_to t('.back'), outbox_messages_path, :class => "button deemphasize" %>
   </div>
diff --git a/config/routes.rb b/config/routes.rb
index 9ab3f57da..741268e46 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -263,10 +263,16 @@ OpenStreetMap::Application.routes.draw do
   get "/export/embed" => "export#embed"
 
   # messages
-  get "/user/:display_name/inbox" => "messages#inbox", :as => "inbox"
-  get "/user/:display_name/outbox" => "messages#outbox", :as => "outbox"
+  resources :messages, :only => [:show] do
+    collection do
+      get :inbox
+      get :outbox
+    end
+  end
+  get "/user/:display_name/inbox", :to => redirect(:path => "/messages/inbox")
+  get "/user/:display_name/outbox", :to => redirect(:path => "/messages/outbox")
   match "/message/new/:display_name" => "messages#new", :via => [:get, :post], :as => "new_message"
-  get "/message/read/:message_id" => "messages#show", :as => "message"
+  get "/message/read/:message_id", :to => redirect(:path => "/messages/%{message_id}")
   post "/message/mark/:message_id" => "messages#mark", :as => "mark_message"
   match "/message/reply/:message_id" => "messages#reply", :via => [:get, :post], :as => "reply_message"
   post "/message/delete/:message_id" => "messages#destroy", :as => "destroy_message"
diff --git a/lib/potlatch2.rb b/lib/potlatch2.rb
index fc0be8644..5fe171f74 100644
--- a/lib/potlatch2.rb
+++ b/lib/potlatch2.rb
@@ -33,6 +33,7 @@ module Potlatch2
     "fo" => "fo",
     "fr" => "fr_FR",
     "fur" => "fur",
+    "fy" => "fy",
     "ga" => "ga",
     "gd" => "gd",
     "gl" => "gl",
@@ -65,6 +66,7 @@ module Potlatch2
     "mr" => "mr",
     "ms" => "ms",
     "nb" => "nb_NO",
+    "ne" => "ne",
     "nl" => "nl_NL",
     "nn" => "nn_NO",
     "no" => "nb_NO",
@@ -79,15 +81,18 @@ module Potlatch2
     "rue" => "rue",
     "sah" => "sah",
     "scn" => "scn",
+    "shn" => "shn",
     "sk" => "sk",
     "skr" => "skr-arab",
     "sl" => "sl",
     "sq" => "sq",
     "sr" => "sr-ec",
     "sr-Latn" => "sr-el",
+    "sty" => "sty",
     "sv" => "sv_SE",
     "ta" => "ta",
     "te" => "te",
+    "th" => "th",
     "tl" => "tl",
     "tly" => "tly",
     "tr" => "tr",
diff --git a/test/controllers/changeset_controller_test.rb b/test/controllers/changeset_controller_test.rb
index 38d6ac162..e8fde7c92 100644
--- a/test/controllers/changeset_controller_test.rb
+++ b/test/controllers/changeset_controller_test.rb
@@ -557,7 +557,7 @@ CHANGESET
   end
 
   def test_repeated_changeset_create
-    30.times do
+    3.times do
       basic_authorization create(:user).email, "test"
 
       # create a temporary changeset
diff --git a/test/controllers/messages_controller_test.rb b/test/controllers/messages_controller_test.rb
index b5ca0dd3a..bffe3e1df 100644
--- a/test/controllers/messages_controller_test.rb
+++ b/test/controllers/messages_controller_test.rb
@@ -5,12 +5,12 @@ class MessagesControllerTest < ActionController::TestCase
   # test all routes which lead to this controller
   def test_routes
     assert_routing(
-      { :path => "/user/username/inbox", :method => :get },
-      { :controller => "messages", :action => "inbox", :display_name => "username" }
+      { :path => "/messages/inbox", :method => :get },
+      { :controller => "messages", :action => "inbox" }
     )
     assert_routing(
-      { :path => "/user/username/outbox", :method => :get },
-      { :controller => "messages", :action => "outbox", :display_name => "username" }
+      { :path => "/messages/outbox", :method => :get },
+      { :controller => "messages", :action => "outbox" }
     )
     assert_routing(
       { :path => "/message/new/username", :method => :get },
@@ -21,8 +21,8 @@ class MessagesControllerTest < ActionController::TestCase
       { :controller => "messages", :action => "new", :display_name => "username" }
     )
     assert_routing(
-      { :path => "/message/read/1", :method => :get },
-      { :controller => "messages", :action => "show", :message_id => "1" }
+      { :path => "/messages/1", :method => :get },
+      { :controller => "messages", :action => "show", :id => "1" }
     )
     assert_routing(
       { :path => "/message/mark/1", :method => :post },
@@ -171,14 +171,14 @@ class MessagesControllerTest < ActionController::TestCase
                           :message => { :title => "Test Message", :body => "Test message body" } }
       end
     end
-    assert_redirected_to inbox_path(:display_name => user.display_name)
+    assert_redirected_to inbox_messages_path
     assert_equal "Message sent", flash[:notice]
     e = ActionMailer::Base.deliveries.first
     assert_equal [recipient_user.email], e.to
     assert_equal "[OpenStreetMap] Test Message", e.subject
     assert_match /Test message body/, e.text_part.decoded
     assert_match /Test message body/, e.html_part.decoded
-    assert_match %r{#{SERVER_URL}/message/read/}, e.text_part.decoded
+    assert_match %r{#{SERVER_URL}/messages/[0-9]+}, e.text_part.decoded
     ActionMailer::Base.deliveries.clear
     m = Message.last
     assert_equal user.id, m.from_user_id
@@ -273,22 +273,22 @@ class MessagesControllerTest < ActionController::TestCase
     unread_message = create(:message, :unread, :sender => user, :recipient => recipient_user)
 
     # Check that the show message page requires us to login
-    get :show, :params => { :message_id => unread_message.id }
-    assert_redirected_to login_path(:referer => message_path(:message_id => unread_message.id))
+    get :show, :params => { :id => unread_message.id }
+    assert_redirected_to login_path(:referer => message_path(:id => unread_message.id))
 
     # Login as the wrong user
     session[:user] = other_user.id
 
     # Check that we can't read the message
-    get :show, :params => { :message_id => unread_message.id }
-    assert_redirected_to login_path(:referer => message_path(:message_id => unread_message.id))
+    get :show, :params => { :id => unread_message.id }
+    assert_redirected_to login_path(:referer => message_path(:id => unread_message.id))
     assert_equal "You are logged in as `#{other_user.display_name}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it.", flash[:notice]
 
     # Login as the message sender
     session[:user] = user.id
 
     # Check that the message sender can read the message
-    get :show, :params => { :message_id => unread_message.id }
+    get :show, :params => { :id => unread_message.id }
     assert_response :success
     assert_template "show"
     assert_equal false, Message.find(unread_message.id).message_read
@@ -297,7 +297,7 @@ class MessagesControllerTest < ActionController::TestCase
     session[:user] = recipient_user.id
 
     # Check that the message recipient can read the message
-    get :show, :params => { :message_id => unread_message.id }
+    get :show, :params => { :id => unread_message.id }
     assert_response :success
     assert_template "show"
     assert_equal true, Message.find(unread_message.id).message_read
@@ -308,7 +308,7 @@ class MessagesControllerTest < ActionController::TestCase
     end
 
     # Asking to read a message with a bogus ID should fail
-    get :show, :params => { :message_id => 99999 }
+    get :show, :params => { :id => 99999 }
     assert_response :not_found
     assert_template "no_such_message"
   end
@@ -317,55 +317,45 @@ class MessagesControllerTest < ActionController::TestCase
   # test the inbox action
   def test_inbox
     user = create(:user)
-    other_user = create(:user)
     read_message = create(:message, :read, :recipient => user)
     # Check that the inbox page requires us to login
-    get :inbox, :params => { :display_name => user.display_name }
-    assert_redirected_to login_path(:referer => inbox_path(:display_name => user.display_name))
+    get :inbox
+    assert_redirected_to login_path(:referer => inbox_messages_path)
 
     # Login
     session[:user] = user.id
 
     # Check that we can view our inbox when logged in
-    get :inbox, :params => { :display_name => user.display_name }
+    get :inbox
     assert_response :success
     assert_template "inbox"
     assert_select "table.messages", :count => 1 do
       assert_select "tr", :count => 2
       assert_select "tr#inbox-#{read_message.id}.inbox-row", :count => 1
     end
-
-    # Check that we can't view somebody else's inbox when logged in
-    get :inbox, :params => { :display_name => other_user.display_name }
-    assert_redirected_to inbox_path(:display_name => user.display_name)
   end
 
   ##
   # test the outbox action
   def test_outbox
     user = create(:user)
-    other_user = create(:user)
     create(:message, :sender => user)
 
     # Check that the outbox page requires us to login
-    get :outbox, :params => { :display_name => user.display_name }
-    assert_redirected_to login_path(:referer => outbox_path(:display_name => user.display_name))
+    get :outbox
+    assert_redirected_to login_path(:referer => outbox_messages_path)
 
     # Login
     session[:user] = user.id
 
     # Check that we can view our outbox when logged in
-    get :outbox, :params => { :display_name => user.display_name }
+    get :outbox
     assert_response :success
     assert_template "outbox"
     assert_select "table.messages", :count => 1 do
       assert_select "tr", :count => 2
       assert_select "tr.inbox-row", :count => 1
     end
-
-    # Check that we can't view somebody else's outbox when logged in
-    get :outbox, :params => { :display_name => other_user.display_name }
-    assert_redirected_to outbox_path(:display_name => user.display_name)
   end
 
   ##
@@ -393,12 +383,12 @@ class MessagesControllerTest < ActionController::TestCase
 
     # Check that the marking a message read works
     post :mark, :params => { :message_id => unread_message.id, :mark => "read" }
-    assert_redirected_to inbox_path(:display_name => recipient_user.display_name)
+    assert_redirected_to inbox_messages_path
     assert_equal true, Message.find(unread_message.id).message_read
 
     # Check that the marking a message unread works
     post :mark, :params => { :message_id => unread_message.id, :mark => "unread" }
-    assert_redirected_to inbox_path(:display_name => recipient_user.display_name)
+    assert_redirected_to inbox_messages_path
     assert_equal false, Message.find(unread_message.id).message_read
 
     # Check that the marking a message read via XHR works
@@ -450,15 +440,15 @@ class MessagesControllerTest < ActionController::TestCase
 
     # Check that the destroy a received message works
     post :destroy, :params => { :message_id => read_message.id }
-    assert_redirected_to inbox_path(:display_name => user.display_name)
+    assert_redirected_to inbox_messages_path
     assert_equal "Message deleted", flash[:notice]
     m = Message.find(read_message.id)
     assert_equal true, m.from_user_visible
     assert_equal false, m.to_user_visible
 
     # Check that the destroying a sent message works
-    post :destroy, :params => { :message_id => sent_message.id, :referer => outbox_path(:display_name => user.display_name) }
-    assert_redirected_to outbox_path(:display_name => user.display_name)
+    post :destroy, :params => { :message_id => sent_message.id, :referer => outbox_messages_path }
+    assert_redirected_to outbox_messages_path
     assert_equal "Message deleted", flash[:notice]
     m = Message.find(sent_message.id)
     assert_equal false, m.from_user_visible
diff --git a/test/controllers/old_node_controller_test.rb b/test/controllers/old_node_controller_test.rb
index e08fbb65e..1f8743141 100644
--- a/test/controllers/old_node_controller_test.rb
+++ b/test/controllers/old_node_controller_test.rb
@@ -55,7 +55,7 @@ class OldNodeControllerTest < ActionController::TestCase
     versions[xml_node["version"]] = xml_doc.to_s
 
     # randomly move the node about
-    20.times do
+    3.times do
       # move the node somewhere else
       xml_node["lat"] = precision(rand * 180 - 90).to_s
       xml_node["lon"] = precision(rand * 360 - 180).to_s
@@ -70,7 +70,7 @@ class OldNodeControllerTest < ActionController::TestCase
     end
 
     # add a bunch of random tags
-    30.times do
+    3.times do
       xml_tag = XML::Node.new("tag")
       xml_tag["k"] = random_string
       xml_tag["v"] = random_string
@@ -105,7 +105,7 @@ class OldNodeControllerTest < ActionController::TestCase
     versions[xml_node["version"]] = xml_doc.to_s
 
     # randomly move the node about
-    20.times do
+    3.times do
       # move the node somewhere else
       xml_node["lat"] = precision(rand * 180 - 90).to_s
       xml_node["lon"] = precision(rand * 360 - 180).to_s
@@ -120,7 +120,7 @@ class OldNodeControllerTest < ActionController::TestCase
     end
 
     # add a bunch of random tags
-    30.times do
+    3.times do
       xml_tag = XML::Node.new("tag")
       xml_tag["k"] = random_string
       xml_tag["v"] = random_string
diff --git a/vendor/assets/potlatch2/potlatch2.swf b/vendor/assets/potlatch2/potlatch2.swf
index 0d52185e2..d5abb9ae0 100644
Binary files a/vendor/assets/potlatch2/potlatch2.swf and b/vendor/assets/potlatch2/potlatch2.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/assets.zip b/vendor/assets/potlatch2/potlatch2/assets.zip
index c47ee6e6f..313670722 100644
Binary files a/vendor/assets/potlatch2/potlatch2/assets.zip and b/vendor/assets/potlatch2/potlatch2/assets.zip differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/af.swf b/vendor/assets/potlatch2/potlatch2/locales/af.swf
index 2cb592f3d..58bd8ab5d 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/af.swf and b/vendor/assets/potlatch2/potlatch2/locales/af.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/ar.swf b/vendor/assets/potlatch2/potlatch2/locales/ar.swf
index 794a47c02..183a33ec1 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ar.swf and b/vendor/assets/potlatch2/potlatch2/locales/ar.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/arc.swf b/vendor/assets/potlatch2/potlatch2/locales/arc.swf
index 1962ca34c..36d42b835 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/arc.swf and b/vendor/assets/potlatch2/potlatch2/locales/arc.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/ast.swf b/vendor/assets/potlatch2/potlatch2/locales/ast.swf
index baad54eb0..f167ec4a4 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ast.swf and b/vendor/assets/potlatch2/potlatch2/locales/ast.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/az.swf b/vendor/assets/potlatch2/potlatch2/locales/az.swf
index e3386de06..49ea1aba8 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/az.swf and b/vendor/assets/potlatch2/potlatch2/locales/az.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/ba.swf b/vendor/assets/potlatch2/potlatch2/locales/ba.swf
index 3f289fdb7..b708cccae 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ba.swf and b/vendor/assets/potlatch2/potlatch2/locales/ba.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/be-tarask.swf b/vendor/assets/potlatch2/potlatch2/locales/be-tarask.swf
index e0e6348bc..93b0c405d 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/be-tarask.swf and b/vendor/assets/potlatch2/potlatch2/locales/be-tarask.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/be.swf b/vendor/assets/potlatch2/potlatch2/locales/be.swf
index f2efc2efe..33ea44673 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/be.swf and b/vendor/assets/potlatch2/potlatch2/locales/be.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/bg.swf b/vendor/assets/potlatch2/potlatch2/locales/bg.swf
index fe48a07c7..a147e0e7c 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/bg.swf and b/vendor/assets/potlatch2/potlatch2/locales/bg.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/bn.swf b/vendor/assets/potlatch2/potlatch2/locales/bn.swf
index e7d64e612..b30c68b01 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/bn.swf and b/vendor/assets/potlatch2/potlatch2/locales/bn.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/br.swf b/vendor/assets/potlatch2/potlatch2/locales/br.swf
index 7637432b7..2e51d91fc 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/br.swf and b/vendor/assets/potlatch2/potlatch2/locales/br.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/bs.swf b/vendor/assets/potlatch2/potlatch2/locales/bs.swf
index cb00ca024..ee31f1468 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/bs.swf and b/vendor/assets/potlatch2/potlatch2/locales/bs.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/ca.swf b/vendor/assets/potlatch2/potlatch2/locales/ca.swf
index ce9139924..3d10696a0 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ca.swf and b/vendor/assets/potlatch2/potlatch2/locales/ca.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/ce.swf b/vendor/assets/potlatch2/potlatch2/locales/ce.swf
index 886d062a9..502338625 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ce.swf and b/vendor/assets/potlatch2/potlatch2/locales/ce.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/cs_CZ.swf b/vendor/assets/potlatch2/potlatch2/locales/cs_CZ.swf
index 72ad6dcfe..e821b85a7 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/cs_CZ.swf and b/vendor/assets/potlatch2/potlatch2/locales/cs_CZ.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/cy.swf b/vendor/assets/potlatch2/potlatch2/locales/cy.swf
index 9202bb135..a3a05f5a6 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/cy.swf and b/vendor/assets/potlatch2/potlatch2/locales/cy.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/da.swf b/vendor/assets/potlatch2/potlatch2/locales/da.swf
index 5e55ab458..97ddb9ffc 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/da.swf and b/vendor/assets/potlatch2/potlatch2/locales/da.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/de-formal.swf b/vendor/assets/potlatch2/potlatch2/locales/de-formal.swf
index 41c137bde..fd203b3fa 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/de-formal.swf and b/vendor/assets/potlatch2/potlatch2/locales/de-formal.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/de_DE.swf b/vendor/assets/potlatch2/potlatch2/locales/de_DE.swf
index af99095bd..7a23936c2 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/de_DE.swf and b/vendor/assets/potlatch2/potlatch2/locales/de_DE.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/diq.swf b/vendor/assets/potlatch2/potlatch2/locales/diq.swf
index 8a3339b8a..ccdbfb1bf 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/diq.swf and b/vendor/assets/potlatch2/potlatch2/locales/diq.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/dsb.swf b/vendor/assets/potlatch2/potlatch2/locales/dsb.swf
index d31c26f71..83a853623 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/dsb.swf and b/vendor/assets/potlatch2/potlatch2/locales/dsb.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/el.swf b/vendor/assets/potlatch2/potlatch2/locales/el.swf
index 8840d9376..79902e5c4 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/el.swf and b/vendor/assets/potlatch2/potlatch2/locales/el.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/en_GB.swf b/vendor/assets/potlatch2/potlatch2/locales/en_GB.swf
index 7044c7df3..577af4a88 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/en_GB.swf and b/vendor/assets/potlatch2/potlatch2/locales/en_GB.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/en_US.swf b/vendor/assets/potlatch2/potlatch2/locales/en_US.swf
index dafd55148..86b6f28be 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/en_US.swf and b/vendor/assets/potlatch2/potlatch2/locales/en_US.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/eo.swf b/vendor/assets/potlatch2/potlatch2/locales/eo.swf
index 8a4a62986..8e4bbc382 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/eo.swf and b/vendor/assets/potlatch2/potlatch2/locales/eo.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/es_ES.swf b/vendor/assets/potlatch2/potlatch2/locales/es_ES.swf
index d40c8760d..b50a2adb5 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/es_ES.swf and b/vendor/assets/potlatch2/potlatch2/locales/es_ES.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/et.swf b/vendor/assets/potlatch2/potlatch2/locales/et.swf
index 7bb1f2305..e65dd758b 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/et.swf and b/vendor/assets/potlatch2/potlatch2/locales/et.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/eu.swf b/vendor/assets/potlatch2/potlatch2/locales/eu.swf
index 280527b7c..91d10a4a6 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/eu.swf and b/vendor/assets/potlatch2/potlatch2/locales/eu.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/fa.swf b/vendor/assets/potlatch2/potlatch2/locales/fa.swf
index acc3f1f29..7b9b1385f 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/fa.swf and b/vendor/assets/potlatch2/potlatch2/locales/fa.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/fi.swf b/vendor/assets/potlatch2/potlatch2/locales/fi.swf
index 9dde244e8..f5ea48660 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/fi.swf and b/vendor/assets/potlatch2/potlatch2/locales/fi.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/fo.swf b/vendor/assets/potlatch2/potlatch2/locales/fo.swf
index a636f7263..67a149542 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/fo.swf and b/vendor/assets/potlatch2/potlatch2/locales/fo.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/fr_FR.swf b/vendor/assets/potlatch2/potlatch2/locales/fr_FR.swf
index 37423d139..ee73d8b2d 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/fr_FR.swf and b/vendor/assets/potlatch2/potlatch2/locales/fr_FR.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/fur.swf b/vendor/assets/potlatch2/potlatch2/locales/fur.swf
index c0e0a4c81..5a5ac5101 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/fur.swf and b/vendor/assets/potlatch2/potlatch2/locales/fur.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/fy.swf b/vendor/assets/potlatch2/potlatch2/locales/fy.swf
new file mode 100644
index 000000000..89e003802
Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/fy.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/ga.swf b/vendor/assets/potlatch2/potlatch2/locales/ga.swf
index 9cf693561..bbea73d7c 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ga.swf and b/vendor/assets/potlatch2/potlatch2/locales/ga.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/gd.swf b/vendor/assets/potlatch2/potlatch2/locales/gd.swf
index bed95e439..f5f873130 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/gd.swf and b/vendor/assets/potlatch2/potlatch2/locales/gd.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/gl.swf b/vendor/assets/potlatch2/potlatch2/locales/gl.swf
index dad0c2b14..c28d49227 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/gl.swf and b/vendor/assets/potlatch2/potlatch2/locales/gl.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/grc.swf b/vendor/assets/potlatch2/potlatch2/locales/grc.swf
index 2141dfb0c..455dd550b 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/grc.swf and b/vendor/assets/potlatch2/potlatch2/locales/grc.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/he.swf b/vendor/assets/potlatch2/potlatch2/locales/he.swf
index d52f328cf..41f50ef13 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/he.swf and b/vendor/assets/potlatch2/potlatch2/locales/he.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/hr.swf b/vendor/assets/potlatch2/potlatch2/locales/hr.swf
index 6be823004..55d33456e 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/hr.swf and b/vendor/assets/potlatch2/potlatch2/locales/hr.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/hsb.swf b/vendor/assets/potlatch2/potlatch2/locales/hsb.swf
index d2856baf8..cb1c5270c 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/hsb.swf and b/vendor/assets/potlatch2/potlatch2/locales/hsb.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/hu.swf b/vendor/assets/potlatch2/potlatch2/locales/hu.swf
index 54bc6d3a7..bd4551a05 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/hu.swf and b/vendor/assets/potlatch2/potlatch2/locales/hu.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/ia.swf b/vendor/assets/potlatch2/potlatch2/locales/ia.swf
index 3dcda7ff4..7500b7ea2 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ia.swf and b/vendor/assets/potlatch2/potlatch2/locales/ia.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/id.swf b/vendor/assets/potlatch2/potlatch2/locales/id.swf
index 177c2ee35..e2d121bf3 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/id.swf and b/vendor/assets/potlatch2/potlatch2/locales/id.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/is.swf b/vendor/assets/potlatch2/potlatch2/locales/is.swf
index 36b9a2c05..f32b92571 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/is.swf and b/vendor/assets/potlatch2/potlatch2/locales/is.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/it_IT.swf b/vendor/assets/potlatch2/potlatch2/locales/it_IT.swf
index f0d9d67d0..c6e54841a 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/it_IT.swf and b/vendor/assets/potlatch2/potlatch2/locales/it_IT.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/ja_JP.swf b/vendor/assets/potlatch2/potlatch2/locales/ja_JP.swf
index 11e99cf70..f180598be 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ja_JP.swf and b/vendor/assets/potlatch2/potlatch2/locales/ja_JP.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/ka.swf b/vendor/assets/potlatch2/potlatch2/locales/ka.swf
index 8ed169cc3..f59002a20 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ka.swf and b/vendor/assets/potlatch2/potlatch2/locales/ka.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/kab.swf b/vendor/assets/potlatch2/potlatch2/locales/kab.swf
index 6fc598f93..32244ea5b 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/kab.swf and b/vendor/assets/potlatch2/potlatch2/locales/kab.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/km.swf b/vendor/assets/potlatch2/potlatch2/locales/km.swf
index eb5e6d468..4c5c8248e 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/km.swf and b/vendor/assets/potlatch2/potlatch2/locales/km.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/kn.swf b/vendor/assets/potlatch2/potlatch2/locales/kn.swf
index cec9b4f8c..ba3076ee5 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/kn.swf and b/vendor/assets/potlatch2/potlatch2/locales/kn.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/ko.swf b/vendor/assets/potlatch2/potlatch2/locales/ko.swf
index 3947beb8e..02d596fe9 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ko.swf and b/vendor/assets/potlatch2/potlatch2/locales/ko.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/krc.swf b/vendor/assets/potlatch2/potlatch2/locales/krc.swf
index 6c769d4c7..c7966c1e9 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/krc.swf and b/vendor/assets/potlatch2/potlatch2/locales/krc.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/ksh.swf b/vendor/assets/potlatch2/potlatch2/locales/ksh.swf
index 70ab863b1..4ebcf5743 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ksh.swf and b/vendor/assets/potlatch2/potlatch2/locales/ksh.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/ku-latn.swf b/vendor/assets/potlatch2/potlatch2/locales/ku-latn.swf
index 7c0a1edeb..eeeeb12f4 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ku-latn.swf and b/vendor/assets/potlatch2/potlatch2/locales/ku-latn.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/ky.swf b/vendor/assets/potlatch2/potlatch2/locales/ky.swf
index 88222052c..a54a23f74 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ky.swf and b/vendor/assets/potlatch2/potlatch2/locales/ky.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/lb.swf b/vendor/assets/potlatch2/potlatch2/locales/lb.swf
index a2e5820ef..c7293536e 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/lb.swf and b/vendor/assets/potlatch2/potlatch2/locales/lb.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/lez.swf b/vendor/assets/potlatch2/potlatch2/locales/lez.swf
index 4178ffd4e..bf78c2ec9 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/lez.swf and b/vendor/assets/potlatch2/potlatch2/locales/lez.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/lt.swf b/vendor/assets/potlatch2/potlatch2/locales/lt.swf
index 89161cca0..91cb26ec4 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/lt.swf and b/vendor/assets/potlatch2/potlatch2/locales/lt.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/lv.swf b/vendor/assets/potlatch2/potlatch2/locales/lv.swf
index c8b44ddd4..e6eb43418 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/lv.swf and b/vendor/assets/potlatch2/potlatch2/locales/lv.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/lzz.swf b/vendor/assets/potlatch2/potlatch2/locales/lzz.swf
index 3bfa7af62..d01562775 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/lzz.swf and b/vendor/assets/potlatch2/potlatch2/locales/lzz.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/mg.swf b/vendor/assets/potlatch2/potlatch2/locales/mg.swf
index 4a6866927..243138d82 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/mg.swf and b/vendor/assets/potlatch2/potlatch2/locales/mg.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/mk.swf b/vendor/assets/potlatch2/potlatch2/locales/mk.swf
index 6811a0bd8..1f8b9c94f 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/mk.swf and b/vendor/assets/potlatch2/potlatch2/locales/mk.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/mr.swf b/vendor/assets/potlatch2/potlatch2/locales/mr.swf
index 2a047b66c..8df83f3c3 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/mr.swf and b/vendor/assets/potlatch2/potlatch2/locales/mr.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/ms.swf b/vendor/assets/potlatch2/potlatch2/locales/ms.swf
index 22b8864c5..760d095db 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ms.swf and b/vendor/assets/potlatch2/potlatch2/locales/ms.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/nb_NO.swf b/vendor/assets/potlatch2/potlatch2/locales/nb_NO.swf
index 17a9aeabc..1c10cd466 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/nb_NO.swf and b/vendor/assets/potlatch2/potlatch2/locales/nb_NO.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/ne.swf b/vendor/assets/potlatch2/potlatch2/locales/ne.swf
new file mode 100644
index 000000000..c164b28a5
Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/ne.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/nl_NL.swf b/vendor/assets/potlatch2/potlatch2/locales/nl_NL.swf
index 9a8e78bdd..394648013 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/nl_NL.swf and b/vendor/assets/potlatch2/potlatch2/locales/nl_NL.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/nn_NO.swf b/vendor/assets/potlatch2/potlatch2/locales/nn_NO.swf
index ed1075ce3..366a24678 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/nn_NO.swf and b/vendor/assets/potlatch2/potlatch2/locales/nn_NO.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/oc.swf b/vendor/assets/potlatch2/potlatch2/locales/oc.swf
index 8276fc08a..7b5255b9e 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/oc.swf and b/vendor/assets/potlatch2/potlatch2/locales/oc.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/pa.swf b/vendor/assets/potlatch2/potlatch2/locales/pa.swf
index 9ecc5b599..190604b33 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/pa.swf and b/vendor/assets/potlatch2/potlatch2/locales/pa.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/pl_PL.swf b/vendor/assets/potlatch2/potlatch2/locales/pl_PL.swf
index 236d44e0e..b3e121caa 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/pl_PL.swf and b/vendor/assets/potlatch2/potlatch2/locales/pl_PL.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/ps.swf b/vendor/assets/potlatch2/potlatch2/locales/ps.swf
index 928c85439..147546258 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ps.swf and b/vendor/assets/potlatch2/potlatch2/locales/ps.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/pt_BR.swf b/vendor/assets/potlatch2/potlatch2/locales/pt_BR.swf
index 40560d901..481e1d762 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/pt_BR.swf and b/vendor/assets/potlatch2/potlatch2/locales/pt_BR.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/pt_PT.swf b/vendor/assets/potlatch2/potlatch2/locales/pt_PT.swf
index fde148a9d..7f127065c 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/pt_PT.swf and b/vendor/assets/potlatch2/potlatch2/locales/pt_PT.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/ro.swf b/vendor/assets/potlatch2/potlatch2/locales/ro.swf
index ba646bc6f..f0a092b6a 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ro.swf and b/vendor/assets/potlatch2/potlatch2/locales/ro.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/ru.swf b/vendor/assets/potlatch2/potlatch2/locales/ru.swf
index 0eafb3b60..f3127e562 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ru.swf and b/vendor/assets/potlatch2/potlatch2/locales/ru.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/rue.swf b/vendor/assets/potlatch2/potlatch2/locales/rue.swf
index 344ad55d8..26b3b11ae 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/rue.swf and b/vendor/assets/potlatch2/potlatch2/locales/rue.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/sah.swf b/vendor/assets/potlatch2/potlatch2/locales/sah.swf
index 0fa7d06ea..18ba7953f 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/sah.swf and b/vendor/assets/potlatch2/potlatch2/locales/sah.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/scn.swf b/vendor/assets/potlatch2/potlatch2/locales/scn.swf
index aa83ad460..f37f00e76 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/scn.swf and b/vendor/assets/potlatch2/potlatch2/locales/scn.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/shn.swf b/vendor/assets/potlatch2/potlatch2/locales/shn.swf
new file mode 100644
index 000000000..b06b3aac1
Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/shn.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/sk.swf b/vendor/assets/potlatch2/potlatch2/locales/sk.swf
index c127129da..9dbb7b5c3 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/sk.swf and b/vendor/assets/potlatch2/potlatch2/locales/sk.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/skr-arab.swf b/vendor/assets/potlatch2/potlatch2/locales/skr-arab.swf
index 6bfa6ffaa..66a64341b 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/skr-arab.swf and b/vendor/assets/potlatch2/potlatch2/locales/skr-arab.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/sl.swf b/vendor/assets/potlatch2/potlatch2/locales/sl.swf
index dc877c572..5e14cd93d 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/sl.swf and b/vendor/assets/potlatch2/potlatch2/locales/sl.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/sq.swf b/vendor/assets/potlatch2/potlatch2/locales/sq.swf
index 129fbb76b..381a6b0f2 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/sq.swf and b/vendor/assets/potlatch2/potlatch2/locales/sq.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/sr-ec.swf b/vendor/assets/potlatch2/potlatch2/locales/sr-ec.swf
index d20f5703a..ac984efb3 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/sr-ec.swf and b/vendor/assets/potlatch2/potlatch2/locales/sr-ec.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/sr-el.swf b/vendor/assets/potlatch2/potlatch2/locales/sr-el.swf
index dc409a197..6645dc112 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/sr-el.swf and b/vendor/assets/potlatch2/potlatch2/locales/sr-el.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/sty.swf b/vendor/assets/potlatch2/potlatch2/locales/sty.swf
new file mode 100644
index 000000000..e7414bcbe
Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/sty.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/sv_SE.swf b/vendor/assets/potlatch2/potlatch2/locales/sv_SE.swf
index 033090cf2..6f59472eb 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/sv_SE.swf and b/vendor/assets/potlatch2/potlatch2/locales/sv_SE.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/ta.swf b/vendor/assets/potlatch2/potlatch2/locales/ta.swf
index 8d32a33e1..d211e831b 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ta.swf and b/vendor/assets/potlatch2/potlatch2/locales/ta.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/te.swf b/vendor/assets/potlatch2/potlatch2/locales/te.swf
index cce8b495a..e45aab2de 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/te.swf and b/vendor/assets/potlatch2/potlatch2/locales/te.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/th.swf b/vendor/assets/potlatch2/potlatch2/locales/th.swf
new file mode 100644
index 000000000..1482eed0b
Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/th.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/tl.swf b/vendor/assets/potlatch2/potlatch2/locales/tl.swf
index 28cacedb9..0597c8783 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/tl.swf and b/vendor/assets/potlatch2/potlatch2/locales/tl.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/tly.swf b/vendor/assets/potlatch2/potlatch2/locales/tly.swf
index 32230921f..cbc29e38f 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/tly.swf and b/vendor/assets/potlatch2/potlatch2/locales/tly.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/tr.swf b/vendor/assets/potlatch2/potlatch2/locales/tr.swf
index 43455a791..f7a482dbf 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/tr.swf and b/vendor/assets/potlatch2/potlatch2/locales/tr.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/tyv.swf b/vendor/assets/potlatch2/potlatch2/locales/tyv.swf
index 2b86df955..87ba6464b 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/tyv.swf and b/vendor/assets/potlatch2/potlatch2/locales/tyv.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/tzm.swf b/vendor/assets/potlatch2/potlatch2/locales/tzm.swf
index ce2996332..b0681b6a3 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/tzm.swf and b/vendor/assets/potlatch2/potlatch2/locales/tzm.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/uk.swf b/vendor/assets/potlatch2/potlatch2/locales/uk.swf
index f8da48aa9..e5b88f365 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/uk.swf and b/vendor/assets/potlatch2/potlatch2/locales/uk.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/vi_VN.swf b/vendor/assets/potlatch2/potlatch2/locales/vi_VN.swf
index 15520a2af..ef308f093 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/vi_VN.swf and b/vendor/assets/potlatch2/potlatch2/locales/vi_VN.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/vo.swf b/vendor/assets/potlatch2/potlatch2/locales/vo.swf
index e92534998..de3a2d599 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/vo.swf and b/vendor/assets/potlatch2/potlatch2/locales/vo.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/yi.swf b/vendor/assets/potlatch2/potlatch2/locales/yi.swf
index 8d133c737..ea316ba89 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/yi.swf and b/vendor/assets/potlatch2/potlatch2/locales/yi.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/zh_CN.swf b/vendor/assets/potlatch2/potlatch2/locales/zh_CN.swf
index 1123be539..149f27415 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/zh_CN.swf and b/vendor/assets/potlatch2/potlatch2/locales/zh_CN.swf differ
diff --git a/vendor/assets/potlatch2/potlatch2/locales/zh_TW.swf b/vendor/assets/potlatch2/potlatch2/locales/zh_TW.swf
index 8c8901e55..1ea0dbc5b 100644
Binary files a/vendor/assets/potlatch2/potlatch2/locales/zh_TW.swf and b/vendor/assets/potlatch2/potlatch2/locales/zh_TW.swf differ