Merge remote-tracking branch 'upstream/pull/1892'
authorTom Hughes <tom@compton.nu>
Wed, 6 Jun 2018 13:51:30 +0000 (14:51 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 6 Jun 2018 13:51:30 +0000 (14:51 +0100)
122 files changed:
.rubocop_todo.yml
app/assets/stylesheets/common.scss
app/controllers/diary_entry_controller.rb
app/controllers/messages_controller.rb
app/controllers/site_controller.rb
app/views/browse/not_found.html.erb
app/views/browse/timeout.html.erb
app/views/layouts/_header.html.erb
app/views/messages/inbox.html.erb
app/views/messages/new.html.erb
app/views/messages/outbox.html.erb
app/views/messages/show.html.erb
config/routes.rb
lib/potlatch2.rb
test/controllers/changeset_controller_test.rb
test/controllers/messages_controller_test.rb
test/controllers/old_node_controller_test.rb
vendor/assets/potlatch2/potlatch2.swf
vendor/assets/potlatch2/potlatch2/assets.zip
vendor/assets/potlatch2/potlatch2/locales/af.swf
vendor/assets/potlatch2/potlatch2/locales/ar.swf
vendor/assets/potlatch2/potlatch2/locales/arc.swf
vendor/assets/potlatch2/potlatch2/locales/ast.swf
vendor/assets/potlatch2/potlatch2/locales/az.swf
vendor/assets/potlatch2/potlatch2/locales/ba.swf
vendor/assets/potlatch2/potlatch2/locales/be-tarask.swf
vendor/assets/potlatch2/potlatch2/locales/be.swf
vendor/assets/potlatch2/potlatch2/locales/bg.swf
vendor/assets/potlatch2/potlatch2/locales/bn.swf
vendor/assets/potlatch2/potlatch2/locales/br.swf
vendor/assets/potlatch2/potlatch2/locales/bs.swf
vendor/assets/potlatch2/potlatch2/locales/ca.swf
vendor/assets/potlatch2/potlatch2/locales/ce.swf
vendor/assets/potlatch2/potlatch2/locales/cs_CZ.swf
vendor/assets/potlatch2/potlatch2/locales/cy.swf
vendor/assets/potlatch2/potlatch2/locales/da.swf
vendor/assets/potlatch2/potlatch2/locales/de-formal.swf
vendor/assets/potlatch2/potlatch2/locales/de_DE.swf
vendor/assets/potlatch2/potlatch2/locales/diq.swf
vendor/assets/potlatch2/potlatch2/locales/dsb.swf
vendor/assets/potlatch2/potlatch2/locales/el.swf
vendor/assets/potlatch2/potlatch2/locales/en_GB.swf
vendor/assets/potlatch2/potlatch2/locales/en_US.swf
vendor/assets/potlatch2/potlatch2/locales/eo.swf
vendor/assets/potlatch2/potlatch2/locales/es_ES.swf
vendor/assets/potlatch2/potlatch2/locales/et.swf
vendor/assets/potlatch2/potlatch2/locales/eu.swf
vendor/assets/potlatch2/potlatch2/locales/fa.swf
vendor/assets/potlatch2/potlatch2/locales/fi.swf
vendor/assets/potlatch2/potlatch2/locales/fo.swf
vendor/assets/potlatch2/potlatch2/locales/fr_FR.swf
vendor/assets/potlatch2/potlatch2/locales/fur.swf
vendor/assets/potlatch2/potlatch2/locales/fy.swf [new file with mode: 0644]
vendor/assets/potlatch2/potlatch2/locales/ga.swf
vendor/assets/potlatch2/potlatch2/locales/gd.swf
vendor/assets/potlatch2/potlatch2/locales/gl.swf
vendor/assets/potlatch2/potlatch2/locales/grc.swf
vendor/assets/potlatch2/potlatch2/locales/he.swf
vendor/assets/potlatch2/potlatch2/locales/hr.swf
vendor/assets/potlatch2/potlatch2/locales/hsb.swf
vendor/assets/potlatch2/potlatch2/locales/hu.swf
vendor/assets/potlatch2/potlatch2/locales/ia.swf
vendor/assets/potlatch2/potlatch2/locales/id.swf
vendor/assets/potlatch2/potlatch2/locales/is.swf
vendor/assets/potlatch2/potlatch2/locales/it_IT.swf
vendor/assets/potlatch2/potlatch2/locales/ja_JP.swf
vendor/assets/potlatch2/potlatch2/locales/ka.swf
vendor/assets/potlatch2/potlatch2/locales/kab.swf
vendor/assets/potlatch2/potlatch2/locales/km.swf
vendor/assets/potlatch2/potlatch2/locales/kn.swf
vendor/assets/potlatch2/potlatch2/locales/ko.swf
vendor/assets/potlatch2/potlatch2/locales/krc.swf
vendor/assets/potlatch2/potlatch2/locales/ksh.swf
vendor/assets/potlatch2/potlatch2/locales/ku-latn.swf
vendor/assets/potlatch2/potlatch2/locales/ky.swf
vendor/assets/potlatch2/potlatch2/locales/lb.swf
vendor/assets/potlatch2/potlatch2/locales/lez.swf
vendor/assets/potlatch2/potlatch2/locales/lt.swf
vendor/assets/potlatch2/potlatch2/locales/lv.swf
vendor/assets/potlatch2/potlatch2/locales/lzz.swf
vendor/assets/potlatch2/potlatch2/locales/mg.swf
vendor/assets/potlatch2/potlatch2/locales/mk.swf
vendor/assets/potlatch2/potlatch2/locales/mr.swf
vendor/assets/potlatch2/potlatch2/locales/ms.swf
vendor/assets/potlatch2/potlatch2/locales/nb_NO.swf
vendor/assets/potlatch2/potlatch2/locales/ne.swf [new file with mode: 0644]
vendor/assets/potlatch2/potlatch2/locales/nl_NL.swf
vendor/assets/potlatch2/potlatch2/locales/nn_NO.swf
vendor/assets/potlatch2/potlatch2/locales/oc.swf
vendor/assets/potlatch2/potlatch2/locales/pa.swf
vendor/assets/potlatch2/potlatch2/locales/pl_PL.swf
vendor/assets/potlatch2/potlatch2/locales/ps.swf
vendor/assets/potlatch2/potlatch2/locales/pt_BR.swf
vendor/assets/potlatch2/potlatch2/locales/pt_PT.swf
vendor/assets/potlatch2/potlatch2/locales/ro.swf
vendor/assets/potlatch2/potlatch2/locales/ru.swf
vendor/assets/potlatch2/potlatch2/locales/rue.swf
vendor/assets/potlatch2/potlatch2/locales/sah.swf
vendor/assets/potlatch2/potlatch2/locales/scn.swf
vendor/assets/potlatch2/potlatch2/locales/shn.swf [new file with mode: 0644]
vendor/assets/potlatch2/potlatch2/locales/sk.swf
vendor/assets/potlatch2/potlatch2/locales/skr-arab.swf
vendor/assets/potlatch2/potlatch2/locales/sl.swf
vendor/assets/potlatch2/potlatch2/locales/sq.swf
vendor/assets/potlatch2/potlatch2/locales/sr-ec.swf
vendor/assets/potlatch2/potlatch2/locales/sr-el.swf
vendor/assets/potlatch2/potlatch2/locales/sty.swf [new file with mode: 0644]
vendor/assets/potlatch2/potlatch2/locales/sv_SE.swf
vendor/assets/potlatch2/potlatch2/locales/ta.swf
vendor/assets/potlatch2/potlatch2/locales/te.swf
vendor/assets/potlatch2/potlatch2/locales/th.swf [new file with mode: 0644]
vendor/assets/potlatch2/potlatch2/locales/tl.swf
vendor/assets/potlatch2/potlatch2/locales/tly.swf
vendor/assets/potlatch2/potlatch2/locales/tr.swf
vendor/assets/potlatch2/potlatch2/locales/tyv.swf
vendor/assets/potlatch2/potlatch2/locales/tzm.swf
vendor/assets/potlatch2/potlatch2/locales/uk.swf
vendor/assets/potlatch2/potlatch2/locales/vi_VN.swf
vendor/assets/potlatch2/potlatch2/locales/vo.swf
vendor/assets/potlatch2/potlatch2/locales/yi.swf
vendor/assets/potlatch2/potlatch2/locales/zh_CN.swf
vendor/assets/potlatch2/potlatch2/locales/zh_TW.swf

index 2f6ea0087252f4da718d6035100c28cc8d7c0ed9..362cfcb3235123751c8018c9fb69250bff842c42 100644 (file)
@@ -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.
index eb7cbf84545d7053271448bf4ff364e20ef0b2bb..cef2efbb2d139326a70addbf41395a97c7943194 100644 (file)
@@ -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;
 }
 
index c0b974c5ede139bee5f1bd731154799bc79c61d2..f2c11fc741453c2ee3b643ea266eae5682281583 100644 (file)
@@ -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
index 99884295bb30577ba08cfcaa0e3d1bad3a05d0b3..d1460569243045db32ab88b05d7169771aa0ae15 100644 (file)
@@ -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
 
index d210928817976a67b14cff150738aa24ca8a4c2a..6cbe302d61d2b928b70e5305c8f6a3b9a246efa0 100644 (file)
@@ -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']
     )
 
index 5fe22a68a43c600bcfe701bd6202977e88686c6e..3c4e8a4c837db40655e4c36e717fc52e22f45147 100644 (file)
@@ -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>
index de102e60f29c5dddcf0c6a3bb2fc035bb176dd5a..e6dd7b68d5d20ede57ae500b2692e44ca3ffabdd 100644 (file)
@@ -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>
index a5ab460ce67924f3d294639d179238535decf26d..8411fefdb71a8f5316c6d5b0adad0a9df9ceeea0 100644 (file)
@@ -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 %>
index b51815b4c92487696812829232e96d48042aa81b..03e01915eae205067a106787e63a3fbd43dd6b1a 100644 (file)
@@ -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>
index 73d0ede2aef1e20a22d856a50b7e22703c5191b0..e33bc176d107427b31678f9fbe2602111348a119 100644 (file)
@@ -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 %>
index c9688de51bc16d67b35f07efed4734333d96851a..199cfdc493548b17dbdf9a762ea2fca46e459dbe 100644 (file)
@@ -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>
index 4d2f6f6ce9b7124df088f54143618fb469cafc1a..934cfb99a74499a27fa43372fffea2bc5674613d 100644 (file)
@@ -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>
index 9ab3f57da5d4cf2abb0628745e66fb93dc8f8864..741268e4623ee6202d6791d58e682ef729f72fa7 100644 (file)
@@ -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"
index fc0be86440ffda3b5882b77ded5cc5c9a8911838..5fe171f746fe4f8a57207f6ff11279627fe6a0a4 100644 (file)
@@ -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",
index 38d6ac162ce1e648170b842dfa3ec9e64fe7c79f..e8fde7c92cd73594852716c26733945f5d116b8a 100644 (file)
@@ -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
index b5ca0dd3a7605d1e72de8511b6fe1d704f519c47..bffe3e1df57710708c844b916504eff06e15de99 100644 (file)
@@ -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
index e08fbb65ec48cc5beb278ac7277d0801d0800b66..1f87431415dff2bd75ef7e46470a3e8091ba9dc3 100644 (file)
@@ -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
index 0d52185e2727cad9a575c0037b8476f1cdf6461a..d5abb9ae0a6703b9cc0159397fedc7e01c955877 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2.swf and b/vendor/assets/potlatch2/potlatch2.swf differ
index c47ee6e6f5077dc6ffd4c4507c22169111ab094f..31367072295a241a951b4361871c29fcc0c31c4f 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/assets.zip and b/vendor/assets/potlatch2/potlatch2/assets.zip differ
index 2cb592f3d804dfcfa4060a6b1234db28799622f1..58bd8ab5df6c0c94efe53fead8c1af34868fa3de 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/af.swf and b/vendor/assets/potlatch2/potlatch2/locales/af.swf differ
index 794a47c020bb95620c27762882f560a24ad97b0c..183a33ec19a1483e74ff92fee842965efbd73c02 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ar.swf and b/vendor/assets/potlatch2/potlatch2/locales/ar.swf differ
index 1962ca34c75e096f1689989df2832870cf54f1d9..36d42b83569da161ef69b4106208bc40dd4458c3 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/arc.swf and b/vendor/assets/potlatch2/potlatch2/locales/arc.swf differ
index baad54eb0da8201609a75dc15043642fdd399404..f167ec4a4e5f220fda20568ea3d5056659d2f5d8 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ast.swf and b/vendor/assets/potlatch2/potlatch2/locales/ast.swf differ
index e3386de0604130f29867e81e84c7bc8860188c75..49ea1aba8c7c3ae6a04165b39a9eb451e51e0992 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/az.swf and b/vendor/assets/potlatch2/potlatch2/locales/az.swf differ
index 3f289fdb7a4c5d394a2afaeabe06ed3510a77003..b708cccae5e88a04a24ff9c0c6e199e8f236649e 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ba.swf and b/vendor/assets/potlatch2/potlatch2/locales/ba.swf differ
index e0e6348bcc3f8da44cdc96068db2357250ffe0ce..93b0c405df929f7a2591f8d2a2d55a22809a93c5 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/be-tarask.swf and b/vendor/assets/potlatch2/potlatch2/locales/be-tarask.swf differ
index f2efc2efe68755ee7f1b934619f7c7f0bc08b3df..33ea446739e565bcc59e2cd44d8a91c46158947f 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/be.swf and b/vendor/assets/potlatch2/potlatch2/locales/be.swf differ
index fe48a07c721fca041f6279a461c1e5293e3ef2c2..a147e0e7c19a2d875a3ed8ee6e4ed4dfaba8cf84 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/bg.swf and b/vendor/assets/potlatch2/potlatch2/locales/bg.swf differ
index e7d64e612120a07449c6f2d52f4497bdd93b3599..b30c68b01c42d3e3783f0db397d8e155749c5048 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/bn.swf and b/vendor/assets/potlatch2/potlatch2/locales/bn.swf differ
index 7637432b7d8b3d69ad329e6158adeb3f3f057eea..2e51d91fcce7bd01bd9c64b435fc61842d4244bd 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/br.swf and b/vendor/assets/potlatch2/potlatch2/locales/br.swf differ
index cb00ca024a30d0406a43cbae768a4fa6ec5cc8d1..ee31f1468c17c676ed28ee65489ccdd6db87ba5f 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/bs.swf and b/vendor/assets/potlatch2/potlatch2/locales/bs.swf differ
index ce91399245f9bdbb7a7072a0389e1de07d0d7191..3d10696a09a5b001b74969e3d31ccc7113b1b10a 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ca.swf and b/vendor/assets/potlatch2/potlatch2/locales/ca.swf differ
index 886d062a995c050e991a6ca21607f3b0c5ff0978..5023386259b2134e21d4614e3a89e53599a6e0b7 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ce.swf and b/vendor/assets/potlatch2/potlatch2/locales/ce.swf differ
index 72ad6dcfe0492c77222563a7ce18bea1461f8d09..e821b85a7a2ed0581b6c0c9d09fb9af0022bd32c 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/cs_CZ.swf and b/vendor/assets/potlatch2/potlatch2/locales/cs_CZ.swf differ
index 9202bb13501aab2a28152d551469cbc87559d1f2..a3a05f5a605879a2f76a4b309a872eff88cc43e2 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/cy.swf and b/vendor/assets/potlatch2/potlatch2/locales/cy.swf differ
index 5e55ab4584f35d495a2ba72f5b7fd631a727f479..97ddb9ffcde056faa475b35fb95e91ef99feab99 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/da.swf and b/vendor/assets/potlatch2/potlatch2/locales/da.swf differ
index 41c137bdef35d567dbed1d4de4d9c4b5531348cd..fd203b3fa323f974c55b934c9e4dc0fb49f2180d 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/de-formal.swf and b/vendor/assets/potlatch2/potlatch2/locales/de-formal.swf differ
index af99095bd8e4e23893d67927bbbbc546f1fc9425..7a23936c273a95366c93b253af2f5f4e7425f679 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/de_DE.swf and b/vendor/assets/potlatch2/potlatch2/locales/de_DE.swf differ
index 8a3339b8ad84cee92509fe2fdb425b20c0fb626e..ccdbfb1bfe8240eaf09afabf961f90f3d7c622f3 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/diq.swf and b/vendor/assets/potlatch2/potlatch2/locales/diq.swf differ
index d31c26f71acd08eb92f0b46d6508f05460c9bfb6..83a853623bfffa288fbd7e84fd35278b3e2d64b0 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/dsb.swf and b/vendor/assets/potlatch2/potlatch2/locales/dsb.swf differ
index 8840d93765844ba51b1b776324a0f4930070dace..79902e5c4578572f9de5f9cf6bbfe5d57671b35d 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/el.swf and b/vendor/assets/potlatch2/potlatch2/locales/el.swf differ
index 7044c7df30b7843e444bce9091b417cbe2de9bd5..577af4a88b1413f1114d07b35024b1472b423cd9 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/en_GB.swf and b/vendor/assets/potlatch2/potlatch2/locales/en_GB.swf differ
index dafd55148a7a598fa7eaa450b701c3c2d657eefd..86b6f28befec1bdbb5dfad58d53d2b2fab06d999 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/en_US.swf and b/vendor/assets/potlatch2/potlatch2/locales/en_US.swf differ
index 8a4a6298683b3b8e37b12b9c4b62829b405febf2..8e4bbc3827adfca6796f7e5e88f300e7b1d1585d 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/eo.swf and b/vendor/assets/potlatch2/potlatch2/locales/eo.swf differ
index d40c8760d6fb1bb0b3a60141a80f7c80d2ff9421..b50a2adb5d69ac9dd248cbcf0e61a4ab5d798a71 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/es_ES.swf and b/vendor/assets/potlatch2/potlatch2/locales/es_ES.swf differ
index 7bb1f230523a05cbbdcd79effe5ec585d9b77988..e65dd758bfbe27f980baf92687ad3ecd084d3dae 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/et.swf and b/vendor/assets/potlatch2/potlatch2/locales/et.swf differ
index 280527b7c46f83cc058ea813f23901e499989220..91d10a4a6cdc2757977dd9f1b6caa374f092e3ae 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/eu.swf and b/vendor/assets/potlatch2/potlatch2/locales/eu.swf differ
index acc3f1f29c5f364980cb9d304f54b36538845461..7b9b1385faf9d37422a3e71514dd6ccdb0955e93 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/fa.swf and b/vendor/assets/potlatch2/potlatch2/locales/fa.swf differ
index 9dde244e8b639d3273a302c63b410a0d31a755de..f5ea48660745c638d155c845d39ea4f61bb5a5a3 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/fi.swf and b/vendor/assets/potlatch2/potlatch2/locales/fi.swf differ
index a636f72636668f61e35efcbef98dee4faa51f31d..67a14954216b9b41bfd2e1f61231ab100e27533f 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/fo.swf and b/vendor/assets/potlatch2/potlatch2/locales/fo.swf differ
index 37423d1397f12c6378548a40f23e1593ac12c6a7..ee73d8b2d38436d31e4a812379fc8ee8b8a86af0 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/fr_FR.swf and b/vendor/assets/potlatch2/potlatch2/locales/fr_FR.swf differ
index c0e0a4c817495fd7793f3211787ef134dfd1d250..5a5ac51015bf4d11f1308c3831b48ca8e3757487 100644 (file)
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 (file)
index 0000000..89e0038
Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/fy.swf differ
index 9cf6935612ec711f3d92d0b777e4d4f607cc9ff9..bbea73d7ce305ef96b81dbb42cf8bd2564723f91 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ga.swf and b/vendor/assets/potlatch2/potlatch2/locales/ga.swf differ
index bed95e439b5178343ad8d0b5bbc3bda655f42074..f5f873130d9b5c164b54c1ac688dba406bebdfd2 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/gd.swf and b/vendor/assets/potlatch2/potlatch2/locales/gd.swf differ
index dad0c2b144a0c187a9aa00cead6a9eeb2ec3cc6d..c28d4922728f5cf94f7b692b1146301fb554750f 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/gl.swf and b/vendor/assets/potlatch2/potlatch2/locales/gl.swf differ
index 2141dfb0c48aeba08017a5c4b8046d8fdb8a61fc..455dd550b12f3ff794ae234bfec2bdbf474dcdd7 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/grc.swf and b/vendor/assets/potlatch2/potlatch2/locales/grc.swf differ
index d52f328cf398bf9330786ba833fc10b809885048..41f50ef13912696f89c81cadbad01a6cc6321f04 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/he.swf and b/vendor/assets/potlatch2/potlatch2/locales/he.swf differ
index 6be82300470f9a33d0a166579afeae2414ab17ae..55d33456e927e251e92e7deb1f834da20faf0096 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/hr.swf and b/vendor/assets/potlatch2/potlatch2/locales/hr.swf differ
index d2856baf80616d36c72748f6dd5a9f85670a29ac..cb1c5270c3b6f804c07c882498c7351e2bfde209 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/hsb.swf and b/vendor/assets/potlatch2/potlatch2/locales/hsb.swf differ
index 54bc6d3a7a9079724070ee6dc984d857040f6714..bd4551a0542c93a80e7ef93fbc6fbbf39a2b30f6 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/hu.swf and b/vendor/assets/potlatch2/potlatch2/locales/hu.swf differ
index 3dcda7ff4c791b7deea1cc71b2a9e5c3379815f4..7500b7ea29723b239813ccb8f89f12febe349ab8 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ia.swf and b/vendor/assets/potlatch2/potlatch2/locales/ia.swf differ
index 177c2ee354029943804e5c56453d935905b8b566..e2d121bf3211e4fc0d1a62494d9abd4104abc9cc 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/id.swf and b/vendor/assets/potlatch2/potlatch2/locales/id.swf differ
index 36b9a2c056c5db05acc3c406d57190eda5fb8e34..f32b9257175fc3222919218c057cc6686351b60a 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/is.swf and b/vendor/assets/potlatch2/potlatch2/locales/is.swf differ
index f0d9d67d06b5f9a1d6f17b8b274266ba1f972f6d..c6e54841a52cf394caae8242392f083d180090da 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/it_IT.swf and b/vendor/assets/potlatch2/potlatch2/locales/it_IT.swf differ
index 11e99cf7026e07b66d24a0a2c70d2885b4868e0a..f180598bebbb1868c4d8ae48f757428973e0ee03 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ja_JP.swf and b/vendor/assets/potlatch2/potlatch2/locales/ja_JP.swf differ
index 8ed169cc3a68563ebccbfaa247a6128cf785b5bf..f59002a20054d6397273dd17239d64b2381fd52e 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ka.swf and b/vendor/assets/potlatch2/potlatch2/locales/ka.swf differ
index 6fc598f9385223cfada2ac9b2a507533fcdd53ed..32244ea5be3da437636a10e812f75f7b6ddb048b 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/kab.swf and b/vendor/assets/potlatch2/potlatch2/locales/kab.swf differ
index eb5e6d468ba0b72bee90d30801ab59894815f53b..4c5c8248eddcca0e76127c1feb301359be5df897 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/km.swf and b/vendor/assets/potlatch2/potlatch2/locales/km.swf differ
index cec9b4f8c71420af7e1b5ccba335734b8b49ff3a..ba3076ee5d4198ed25d10268d82902da1fddfefa 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/kn.swf and b/vendor/assets/potlatch2/potlatch2/locales/kn.swf differ
index 3947beb8eb547a4ef4f0759cece16278cb69bf74..02d596fe99b247657cef7cbc8bfed235f543d251 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ko.swf and b/vendor/assets/potlatch2/potlatch2/locales/ko.swf differ
index 6c769d4c74d12754bcbcc05661fb114952227162..c7966c1e907853fbd56888083fefdb8ed19a2cad 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/krc.swf and b/vendor/assets/potlatch2/potlatch2/locales/krc.swf differ
index 70ab863b16835d74b9cde322c7caa59ce78dc129..4ebcf5743030616e7695f76db089dadaba571d65 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ksh.swf and b/vendor/assets/potlatch2/potlatch2/locales/ksh.swf differ
index 7c0a1edeb60f9b59e85b618f36d89ab1772463f7..eeeeb12f4a1a1706ccd8c0e1530d2cda8023b75a 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ku-latn.swf and b/vendor/assets/potlatch2/potlatch2/locales/ku-latn.swf differ
index 88222052c13950a9ac120d4e71f71a3789a2f3de..a54a23f74b09be603c6495aa6dc9bd876b1202fe 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ky.swf and b/vendor/assets/potlatch2/potlatch2/locales/ky.swf differ
index a2e5820ef00525e9ab94c54074d4a2a59527ae37..c7293536eebddc0031c04049e564f314a1386c5a 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/lb.swf and b/vendor/assets/potlatch2/potlatch2/locales/lb.swf differ
index 4178ffd4e0c51b5a7b2afb2714d0699ecac42d62..bf78c2ec95142d7fd8239be9c5565d918eb8ae30 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/lez.swf and b/vendor/assets/potlatch2/potlatch2/locales/lez.swf differ
index 89161cca040976371a52e64ae46f97f7995838e1..91cb26ec4c6b7c581a69250d781638fe85ba303c 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/lt.swf and b/vendor/assets/potlatch2/potlatch2/locales/lt.swf differ
index c8b44ddd47010dd5e6d0560ee48491db908552ee..e6eb434184122a3ce7f0597a0456b8442a25b0db 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/lv.swf and b/vendor/assets/potlatch2/potlatch2/locales/lv.swf differ
index 3bfa7af622ba99231bfee128fdb86d1ae9388e4d..d0156277554b347b6fc410588c94ac8a088d8632 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/lzz.swf and b/vendor/assets/potlatch2/potlatch2/locales/lzz.swf differ
index 4a68669278100a1bbfa8ed38ae8e4273446442f5..243138d82480d2ac21b61a1ee49dd3b17876bee7 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/mg.swf and b/vendor/assets/potlatch2/potlatch2/locales/mg.swf differ
index 6811a0bd81efa1024ae84a8d2baf0dd34a6e3829..1f8b9c94fb5ccf39c938ad857505e182a772f79e 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/mk.swf and b/vendor/assets/potlatch2/potlatch2/locales/mk.swf differ
index 2a047b66c0623ce6ee11676e858ff1d3f0aa74d1..8df83f3c33bbcf54cf647ee96bc089dbc489ac09 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/mr.swf and b/vendor/assets/potlatch2/potlatch2/locales/mr.swf differ
index 22b8864c5a337cf1e33de20f8e4f5a79f339f77b..760d095dbffa0be1d42dda4138198f8a7e78fad8 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ms.swf and b/vendor/assets/potlatch2/potlatch2/locales/ms.swf differ
index 17a9aeabc6512d3b996aaa4d24843c4a030626c7..1c10cd466e4ca1fa73886194e71afaf50478079f 100644 (file)
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 (file)
index 0000000..c164b28
Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/ne.swf differ
index 9a8e78bdd7f8857f60f4bea6b66698ca481f060d..39464801359f2c3fb70800bf58edf684dab83ea3 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/nl_NL.swf and b/vendor/assets/potlatch2/potlatch2/locales/nl_NL.swf differ
index ed1075ce36f7a747be9406dbf32e5b2de50fc779..366a246780009b2783344bd2a864416ad08dd94d 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/nn_NO.swf and b/vendor/assets/potlatch2/potlatch2/locales/nn_NO.swf differ
index 8276fc08a098e97bbf07f7ac4d9e2c5f15519b0a..7b5255b9e5bf67b37170488e6c2ce4301d26d35c 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/oc.swf and b/vendor/assets/potlatch2/potlatch2/locales/oc.swf differ
index 9ecc5b59927238294f394fde614ab896cb5c11d7..190604b33efbcbe04b122d04f41d2d0ede4c744a 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/pa.swf and b/vendor/assets/potlatch2/potlatch2/locales/pa.swf differ
index 236d44e0e83750fe9f8e88a2d15ec70b9f874d3a..b3e121caa26e4ea6d68711eee37cf056a9fe2bd0 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/pl_PL.swf and b/vendor/assets/potlatch2/potlatch2/locales/pl_PL.swf differ
index 928c854390c496017e64153fe7fae7ba9e321b04..14754625819291e24747b5de52ae82ba1d6e729b 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ps.swf and b/vendor/assets/potlatch2/potlatch2/locales/ps.swf differ
index 40560d9014509dcc95b479abcd245e22b663a844..481e1d762597174052df15ff296a204c51b1fbd6 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/pt_BR.swf and b/vendor/assets/potlatch2/potlatch2/locales/pt_BR.swf differ
index fde148a9d9dc860170090b5aa69238a7dce542c8..7f127065c18e29d837f297528eca5f3ff051cd7f 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/pt_PT.swf and b/vendor/assets/potlatch2/potlatch2/locales/pt_PT.swf differ
index ba646bc6f5162c378978161ee1d3012aeb5097ca..f0a092b6ae9f6f0b3479206fbfc18b8cfb5b3051 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ro.swf and b/vendor/assets/potlatch2/potlatch2/locales/ro.swf differ
index 0eafb3b60f155e6f52af1af06689dd50f1c04690..f3127e562d3db80f04b8f9bf953dff1e86d1618a 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ru.swf and b/vendor/assets/potlatch2/potlatch2/locales/ru.swf differ
index 344ad55d879228a03a52783db3240b44c771cab2..26b3b11ae3c74b87207d57d6ac0882112cc0dfc5 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/rue.swf and b/vendor/assets/potlatch2/potlatch2/locales/rue.swf differ
index 0fa7d06eac3cf4d8454769af40cf8964dad45d7d..18ba7953fbb54bd2cdf8cdd999b6494e079b7e36 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/sah.swf and b/vendor/assets/potlatch2/potlatch2/locales/sah.swf differ
index aa83ad4605b331d1f4e125bf401937e02e86754a..f37f00e76d3ea1cdc3ff3a79009ffc2f5bbbe2a9 100644 (file)
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 (file)
index 0000000..b06b3aa
Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/shn.swf differ
index c127129da030d1e880967cc9dca5b9d60abc6987..9dbb7b5c39b0272bafe5b636088305f304bf0ae5 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/sk.swf and b/vendor/assets/potlatch2/potlatch2/locales/sk.swf differ
index 6bfa6ffaac665a096fe6bbe557dc142dc25e8d0e..66a64341bac50182ccc8661120696c9e77f019ec 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/skr-arab.swf and b/vendor/assets/potlatch2/potlatch2/locales/skr-arab.swf differ
index dc877c57274f982483d7b694f4d8f512e44d1da8..5e14cd93d178d1e23539665996542b270dc9b99f 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/sl.swf and b/vendor/assets/potlatch2/potlatch2/locales/sl.swf differ
index 129fbb76b1839b1b0ffcd1c0a5ca8bbde97cd0b8..381a6b0f2fbe9c93f647798afc9536e2fe1031a9 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/sq.swf and b/vendor/assets/potlatch2/potlatch2/locales/sq.swf differ
index d20f5703a0dd21a7b6830b06c247922d08dee58e..ac984efb380c8af02e126f1b00bc8cc88f985b3c 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/sr-ec.swf and b/vendor/assets/potlatch2/potlatch2/locales/sr-ec.swf differ
index dc409a197771f681652d1d0ea625a0d8bec9f4bb..6645dc112a534cf9d4fd20f8b5898bff02dd30ff 100644 (file)
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 (file)
index 0000000..e7414bc
Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/sty.swf differ
index 033090cf21bfc75a956bdc62d9c40e6da9a8f8e0..6f59472eb78a787aa459f1bf8a55c5fbe5d96bb8 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/sv_SE.swf and b/vendor/assets/potlatch2/potlatch2/locales/sv_SE.swf differ
index 8d32a33e1e7d7cb26c8bdc6e29acffb3f747b065..d211e831bd502551c41fb3479044213b327e365f 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/ta.swf and b/vendor/assets/potlatch2/potlatch2/locales/ta.swf differ
index cce8b495a4151377c9e0ac0ce5ed0fee5b1a9880..e45aab2deed30813437a4e62f436f11684fee442 100644 (file)
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 (file)
index 0000000..1482eed
Binary files /dev/null and b/vendor/assets/potlatch2/potlatch2/locales/th.swf differ
index 28cacedb99abcefb6f1f849f3c95b18878a489e9..0597c8783a2b3a355f509b56e8af2a3f11caeb22 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/tl.swf and b/vendor/assets/potlatch2/potlatch2/locales/tl.swf differ
index 32230921f9e3f99db6ee3077434394c86470b371..cbc29e38f9eef71ccc7923280b52b8ef0877ef96 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/tly.swf and b/vendor/assets/potlatch2/potlatch2/locales/tly.swf differ
index 43455a7912fb089d4fd0914584f0df95ff375387..f7a482dbfbf55e706dfad7c1e3a796ca0e4e9a15 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/tr.swf and b/vendor/assets/potlatch2/potlatch2/locales/tr.swf differ
index 2b86df95518f9cd71507d675580a9257714cb553..87ba6464bf16ed18803b3852d4ff1d695c87e318 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/tyv.swf and b/vendor/assets/potlatch2/potlatch2/locales/tyv.swf differ
index ce299633212c60619558da19317dd04dcc28839b..b0681b6a3e3beb42703fc3ef2bb692593e71fabe 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/tzm.swf and b/vendor/assets/potlatch2/potlatch2/locales/tzm.swf differ
index f8da48aa94e04983d861e2414eff679d9534cc59..e5b88f365bc9e77284a5a38c475ef9f2f19538a6 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/uk.swf and b/vendor/assets/potlatch2/potlatch2/locales/uk.swf differ
index 15520a2af20dbc8212bdc79f5754951d245a58fb..ef308f0939e13293722c1e92a859149e96e3ed03 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/vi_VN.swf and b/vendor/assets/potlatch2/potlatch2/locales/vi_VN.swf differ
index e92534998589808302b228db7922a074481e3ad5..de3a2d5992c716903a22db075fdde9f6ba9eca02 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/vo.swf and b/vendor/assets/potlatch2/potlatch2/locales/vo.swf differ
index 8d133c737fec74816164de95d67fa1c67fb52f50..ea316ba89e09f5ac25d66f6f71ecb135a1815634 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/yi.swf and b/vendor/assets/potlatch2/potlatch2/locales/yi.swf differ
index 1123be53940e4eb598a17d97f2fd3daee5cad1a3..149f2741548bdf6b76b2794dd0683033ea90306a 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/zh_CN.swf and b/vendor/assets/potlatch2/potlatch2/locales/zh_CN.swf differ
index 8c8901e556909a7786d037cfc7ca4a4e78b54f05..1ea0dbc5b6a08b0a324e6dc733b75f102fdbef62 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2/locales/zh_TW.swf and b/vendor/assets/potlatch2/potlatch2/locales/zh_TW.swf differ