Changeset 4945

Show
Ignore:
Timestamp:
11/26/07 18:32:39 (1 year ago)
Author:
sato
Message:

1441

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • components/news/trunk/news/languages/english.rb

    r4637 r4945  
    4343    lang('english')['_News_Delete_Failed'] = 'The news deleting was failure.' 
    4444    lang('english')['_News_Confirm_Update'] = 'This news needs approval again. Is it all right?' 
     45    lang('english')['_News_Returned_Message'] = 'Please do "Repost" when you do the approval request again.' 
     46    lang('english')['_News_Approval_Request'] = 'Repost' 
    4547  end 
    4648end 
  • components/news/trunk/news/languages/japanese.rb

    r4637 r4945  
    5555    lang('japanese')['_News_Confirm_Update'] = '線集埌、再承認が忠
    5656芁ですがよろしいですか' 
     57    lang('japanese')['_News_Returned_Message'] = 'もう䞀床承認䟝頌を行う堎合は「再投皿」を行っお䞋さい。' 
     58    lang('japanese')['_News_Approval_Request'] = '承認䟝頌' 
    5759  end 
    5860end 
  • components/news/trunk/news/news/show_news.rhtml

    r4563 r4945  
    2222              </form> 
    2323            <% end %> 
     24          <% if @news.is_returned? %> 
     25            <span style="padding-left: 25px;" class="float_button_left_inactive"> 
     26              <span id="message_returned" class="rubricks_icon icon_information"  style="cursor: default;padding-top: 0px;padding-bottom: 0px;" >&nbsp;</span> 
     27              <span style="font-weight: bold;"><%= hl('[_News_Returned_Message]') %></span> 
     28            </span> 
     29          <% end %> 
    2430          <%= render_float_button_end('float_button_area_show') %> 
    2531          <%= render(:partial => "news/news/news_content") %> 
  • components/news/trunk/news/news_controller.rb

    r4887 r4945  
    108108        @news_date = @news.updated_on.strftime(RubricksLib.hl('[_Common_Date_HourMinSec_Format]')) 
    109109        @edit_button_name = '[_News_Repost]' 
    110         @edit_submit_button_name = '[_News_Repost]' 
     110        @edit_submit_button_name = '[_News_Approval_Request]' 
    111111      end 
    112112    end