From df61683f931c80653f47197529c2fa26ef6baa9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B1=E5=8D=9A=E4=BA=9E?= <naruto0426@gmail.com>
Date: Wed, 17 Nov 2021 17:04:22 +0800
Subject: [PATCH] fix error

---
 app/controllers/announcements_controller.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb
index e8c7ae0..03e3ddf 100644
--- a/app/controllers/announcements_controller.rb
+++ b/app/controllers/announcements_controller.rb
@@ -201,7 +201,7 @@ class AnnouncementsController < ApplicationController
         page = Page.where(:page_id=> subpart.read_more_page_id,:enabled_for=>locale).first rescue nil
         page = Page.where(:module=>"announcement",:enabled_for=>locale).first rescue nil if page.nil?
       end
-      page_url = page.get_url
+      page_url = "/#{locale}#{page.get_url}"
     end
     all_cats = cats.dup
     all_cats.delete "all"
@@ -219,7 +219,7 @@ class AnnouncementsController < ApplicationController
         "<div style=\"clear: both;\"></div>" +
         "<ul class=\"nav_tabs_filter\">" +
           (use_tag ? tags.map.with_index{|tag,i|
-            read_more_url = "/#{locale + page_url}" rescue ""
+            read_more_url = "/#{page_url}" rescue ""
             read_more_url = read_more_url + "?" + {"category"=>all_cats,"tags"=>(tag == 'all' ? all_tags : [tag])}.to_param if read_more_url != ""
             read_more_text = I18n.t("announcement.more")
             if tag != "all"
@@ -231,7 +231,7 @@ class AnnouncementsController < ApplicationController
             end
             "<li class=\"filter_tab#{i == 0 ? ' active' : ''}\" #{(tag == 'all' && @all_setting_option == 0) ? "data-count_limit=\"#{max_all_count}\"" : ''} data-read_more_text=\"#{read_more_text}\" data-read_more=\"#{read_more_url}\" data-tags=\"#{tag}\">#{tags_translations[tag]}</li>"
           }.join("") : cats.map.with_index{|cat,i|
-            read_more_url = "/#{locale + page_url}" rescue ""
+            read_more_url = "/#{page_url}" rescue ""
             read_more_url = read_more_url + "?" + {"category"=>(cat == 'all' ? all_cats : cat)}.to_param if read_more_url != ""
             read_more_text = I18n.t("announcement.more")
             if cat != "all"
@@ -374,7 +374,7 @@ class AnnouncementsController < ApplicationController
       "
     end
     if @tab_option == 0
-      read_more_url = "/#{locale + page_url}" rescue ""
+      read_more_url = "/#{page_url}" rescue ""
       read_more_url = read_more_url + "?" + {"category"=>all_cats,"tags"=>all_tags}.to_param if read_more_url != ""
       extra_after_html += "
       <script style=\"display:none\">