'test'
when :user
'test'
+ when :demand_user
+ 'test'
end
else
'application'
@ar.overwrite @author
respond_to do |format|
if @ar.save
- format.html { redirect_to root_path, notice: 'Artist was successfully created.' }
+ flash[:notice] = I18n.t('flash.notice.created', :model => Artist.model_name.human)
+ format.html { redirect_to root_path }
format.json { render json: @ar.to_json(Artist.show_json_opt), status: :created, location: @artist }
else
format.html { render action: "new" }
respond_to do |format|
if @ar.save
- format.html { redirect_to '/home/configure', notice: 'Artist was successfully updated.' }
+ flash[:notice] = I18n.t('flash.notice.updated', :model => Artist.model_name.human)
+ format.html { redirect_to '/home/configure' }
format.json { head :ok }
else
format.html { render action: "edit" }
@au.overwrite @user.id
respond_to do |format|
if @au.save
- format.html { redirect_to root_path, notice: 'Author was successfully created.' }
+ flash[:notice] = I18n.t('flash.notice.created', :model => Author.model_name.human)
+ format.html { redirect_to root_path }
format.json { render json: @au.to_json(Author.show_json_opt), status: :created, location: @artist }
else
format.html { render action: "new" }
respond_to do |format|
if @au.save
- format.html { redirect_to '/home/configure', notice: 'Author was successfully updated.' }
+ flash[:notice] = I18n.t('flash.notice.updated', :model => Author.model_name.human)
+ format.html { redirect_to '/home/configure' }
format.json { head :ok }
else
format.html { render action: "edit" }
respond_to do |format|
if @comic.save
- format.html { redirect_to @comic, notice: 'Comic was successfully created.' }
+ flash[:notice] = I18n.t('flash.notice.created', :model => Comic.model_name.human)
+ format.html { redirect_to @comic }
format.json { render json: @comic.to_json(Comic.show_json_opt), status: :created, location: @comic }
else
format.html { render action: "new" }
@comic.overwrite @author
respond_to do |format|
if @comic.save
- format.html { redirect_to @comic, notice: 'Comic was successfully updated.' }
+ flash[:notice] = I18n.t('flash.notice.updated', :model => Comic.model_name.human)
+ format.html { redirect_to @comic }
format.json { head :ok }
else
format.html { render action: "edit" }
@demander_status = DemanderStatus.edit(params[:id], @admin)
respond_to do |format|
if @demander_status.approve params[:demander_status][:receive_hour1], params[:demander_status][:receive_hour2]
- format.html { redirect_to @demander_status, notice: 'DemanderStatus was successfully updated.' }
+ flash[:notice] = I18n.t('demander_statuses.flash.notice.approved')
+ format.html { redirect_to @demander_status }
format.json { head :ok }
else
format.html { render action: "edit" }
@demander_status = DemanderStatus.edit(params[:id], @admin)
respond_to do |format|
if @demander_status.reject
- format.html { redirect_to @demander_status, notice: 'DemanderStatus was successfully rejected.' }
+ flash[:notice] = I18n.t('demander_statuses.flash.notice.rejected')
+ format.html { redirect_to @demander_status }
format.json { head :ok }
else
- format.html { redirect_to @demander_status, notice: 'DemanderStatus was not rejected.' }
+ flash[:notice] = I18n.t('demander_statuses.flash.notice.not_rejected')
+ format.html { redirect_to @demander_status }
format.json { render json: @demander_status.errors, status: :unprocessable_entity }
end
end
format.html # index.html.erb
end
else
- redirect_to new_demander_path, notice: 'Demander not found.'
+ flash[:notice] = I18n.t('demanders.flash.notice.not_found')
+ redirect_to new_demander_path
end
end
respond_to do |format|
if @demander.store
- format.html { redirect_to @demander, notice: 'Demander was successfully created.' }
+ flash[:notice] = I18n.t('flash.notice.created', :model => Demander.model_name.human)
+ format.html { redirect_to @demander }
format.json { render json: @demander.to_json(Demander.show_json_opt), status: :created, location: @demander }
else
format.html { render action: "new" }
@demander.overwrite @demand_user
respond_to do |format|
if @demander.store
- format.html { redirect_to @demander, notice: 'Demander was successfully updated.' }
+ flash[:notice] = I18n.t('flash.notice.updated', :model => Demander.model_name.human)
+ format.html { redirect_to @demander }
format.json { head :ok }
else
format.html { render action: "edit" }
@demander = @demand_user.demander
respond_to do |format|
if @demander.demander_status.request
- format.html { redirect_to demanders_path, notice: 'Demander was successfully updated.' }
+ flash[:notice] = I18n.t('demanders.flash.notice.requested')
+ format.html { redirect_to demanders_path }
format.json { head :ok }
else
- format.html { redirect_to demanders_path, notice: 'Demander was not successfully updated.' }
+ flash[:notice] = I18n.t('demanders.flash.notice.not_requested')
+ format.html { redirect_to demanders_path }
format.json { render json: @demander.errors, status: :unprocessable_entity }
end
end
@demander = Demander.edit(params[:id], @demand_user)
respond_to do |format|
if @demander.stop
- format.html { redirect_to demanders_url, notice: 'Demander was successfully stopped.' }
+ flash[:notice] = I18n.t('demanders.flash.notice.stopped')
+ format.html { redirect_to demanders_url }
format.json { head :ok }
else
- format.html { redirect_to demanders_url, notice: 'Demander was not successfully stopped.' }
+ flash[:notice] = I18n.t('demanders.flash.notice.not_stopped')
+ format.html { redirect_to demanders_url }
format.json { render json: @demander.errors, status: :unprocessable_entity }
end
end
end
def create_token
- respond_to do |format|
- if @user.create_token
- format.html { redirect_to({:action => :configure}, {:notice => 'user token was successfully created.'}) }
- else
- format.html { render action: "auth_token" }
+ if @user.create_token
+ respond_to do |format|
+ flash[:notice] = I18n.t('flash.notice.created', :model => User.human_attribute_name(:authentication_token))
+ format.html { redirect_to({:action => :configure}) }
end
+ else
+ flash[:notice] = I18n.t('flash.notice.not_created', :model => User.human_attribute_name(:authentication_token))
+ format.html { render action: "configure" }
end
end
def delete_token
- @user.delete_token
- respond_to do |format|
- format.html { redirect_to :action => :configure}
+ if @user.delete_token
+ respond_to do |format|
+ flash[:notice] = I18n.t('flash.notice.destroyed', :model => User.human_attribute_name(:authentication_token))
+ format.html { redirect_to :action => :configure}
+ end
+ else
+ flash[:notice] = I18n.t('flash.notice.not_destroyed', :model => User.human_attribute_name(:authentication_token))
+ format.html { render action: "configure" }
end
end
end
end
- # GET /original_pictures/new
- # GET /original_pictures/new.json
def new
@original_picture = OriginalPicture.new
@original_picture.supply_default
end
end
- # GET /original_pictures/1/edit
def edit
@original_picture = OriginalPicture.edit(params[:id], @artist)
respond_to do |format|
end
end
- # POST /original_pictures
- # POST /original_pictures.json
def create
@imager = PettanImager.load set_image params[:original_picture][:file]
@original_picture = OriginalPicture.new
respond_to do |format|
if @original_picture.store(@imager)
- format.html { redirect_to @original_picture, notice: 'Original picture was successfully created.' }
+ flash[:notice] = I18n.t('flash.notice.created', :model => OriginalPicture.model_name.human)
+ format.html { redirect_to @original_picture }
format.json { render json: @original_picture.to_json(OriginalPicture.show_json_opt), status: :created, location: @original_picture }
else
format.html { render action: "new" }
end
end
- # PUT /original_pictures/1
- # PUT /original_pictures/1.json
def update
@imager = PettanImager.load set_image params[:original_picture][:file]
@original_picture = OriginalPicture.edit(params[:id], @artist)
respond_to do |format|
if @original_picture.store(@imager)
- format.html { redirect_to @original_picture, notice: 'Original picture was successfully created.' }
+ flash[:notice] = I18n.t('flash.notice.updated', :model => OriginalPicture.model_name.human)
+ format.html { redirect_to @original_picture }
format.json { render json: @original_picture.to_json(OriginalPicture.show_json_opt), status: :created, location: @original_picture }
else
format.html { render action: "edit" }
end
end
- # DELETE /original_pictures/1
- # DELETE /original_pictures/1.json
def destroy
@original_picture = OriginalPicture.edit(params[:id], @artist)
OriginalPicture.transaction do
public
- # GET /panels
- # GET /panels.json
def index
@page = Panel.page params[:page]
@page_size = Panel.page_size params[:page_size]
end
end
- # GET /panels/1
- # GET /panels/1.json
def show
@panel = Panel.show(params[:id], @author)
end
end
- # POST /panels
- # POST /panels.json
def create
@panel = Panel.new
@panel.supply_default
@prm = params[:panel] || jsn
respond_to do |format|
if @panel.store @prm, @author
- format.html { redirect_to @panel, notice: 'Panel was successfully created.' }
+ flash[:notice] = I18n.t('flash.notice.created', :model => Panel.model_name.human)
+ format.html { redirect_to @panel }
format.json { render json: @panel.panel_elements_as_json, status: :created, location: @panel }
else
format.html { render action: "new" }
end
end
- # PUT /panels/1
- # PUT /panels/1.json
def update
@panel = Panel.edit(params[:id], @author)
jsn = nil
@prm = params[:panel] || jsn
respond_to do |format|
if @panel.store @prm, @author
- format.html { redirect_to @panel, notice: 'Panel was successfully updated.' }
+ flash[:notice] = I18n.t('flash.notice.updated', :model => Panel.model_name.human)
+ format.html { redirect_to @panel }
format.json { head :ok }
else
format.html { render action: "edit" }
end
end
- # DELETE /panels/1
- # DELETE /panels/1.json
def destroy
@panel = Panel.edit(params[:id], @author)
respond_to do |format|
@provider_status.overwrite
respond_to do |format|
if @provider_status.save
- format.html { redirect_to @provider_status, notice: 'ProviderStatus was successfully updated.' }
+ flash[:notice] = I18n.t('provider_statuses.flash.notice.created')
+ format.html { redirect_to @provider_status }
format.json { head :ok }
else
format.html { render action: "edit" }
def destroy
@provider_status = ProviderStatus.edit(params[:id], @admin)
- @provider_status.destroy
respond_to do |format|
- format.html { redirect_to comics_url }
- format.json { head :ok }
+ if @provider_status.stop
+ flash[:notice] = I18n.t('provider_statuses.flash.notice.stopped')
+ format.html { redirect_to provider_statuses_url }
+ format.json { head :ok }
+ else
+ flash[:notice] = I18n.t('provider_statuses.flash.notice.not_stopped')
+ format.html { render action: "edit" }
+ format.json { render json: @provider_status.errors, status: :unprocessable_entity }
+ end
end
end
end
end
end
- # GET /stories/new
- # GET /stories/new.js
- # GET /stories/new.json
def new
@story = Story.new
@story.supply_default
end
end
- # GET /stories/1/edit
- # GET /stories/1.js/edit
def edit
@story = Story.edit(params[:id], @author)
respond_to do |format|
end
end
- # POST /stories
- # POST /stories.json
def create
@story = Story.new
@story.supply_default
respond_to do |format|
if @story.store
+ flash[:notice] = I18n.t('flash.notice.created', :model => Story.model_name.human)
format.html { redirect_to action: :comic, id: @story.comic_id }
format.json { render json: @story.story_as_json(@author) }
else
end
end
- # PUT /stories/1
- # PUT /stories/1.json
def update
@story = Story.edit(params[:id], @author)
ot = @story.t
@story.overwrite @author
respond_to do |format|
if @story.store ot
+ flash[:notice] = I18n.t('flash.notice.updated', :model => Story.model_name.human)
format.html { redirect_to action: :comic, id: @story.comic_id }
format.json { head :ok }
else
end
end
- # DELETE /stories/1
- # DELETE /stories/1.js
- # DELETE /stories/1.json
def destroy
@story = Story.edit(params[:id], @author)
Story.transaction do
@admin = current_admin
respond_to do |format|
if @admin.create_token
- format.html { redirect_to({:action => :auth_token}, {:notice => 'admin token was successfully created.'}) }
+ flash[:notice] = I18n.t('flash.notice.created', :model => Admin.human_attribute_name(:authentication_token))
+ format.html { redirect_to({:action => :auth_token}) }
else
+ flash[:notice] = I18n.t('flash.notice.not_created', :model => Admin.human_attribute_name(:authentication_token))
format.html { render action: "auth_token" }
end
end
end
def delete_token
- current_admin.delete_token
respond_to do |format|
- format.html { redirect_to :action => :auth_token}
+ if current_admin.delete_token
+ flash[:notice] = I18n.t('flash.notice.destroyed', :model => Admin.human_attribute_name(:authentication_token))
+ format.html { redirect_to :action => :auth_token}
+ else
+ flash[:notice] = I18n.t('flash.notice.not_destroyed', :model => Admin.human_attribute_name(:authentication_token))
+ format.html { render action: "auth_token" }
+ end
end
end
def self.licensed_pictures stories
r = {}
stories.each do |story|
- r.merge! story.panel.licensed_pictures
+ r.merge!(story.panel.licensed_pictures) if story.panel
end
r
end
-<h2>Sign up</h2>
+<h2><%= t('admins.signup.title') %></h2>
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
<%= devise_error_messages! %>
<div><%= f.label :password_confirmation %><br />
<%= f.password_field :password_confirmation %></div>
- <div><%= f.submit "Sign up" %></div>
+ <div><%= f.submit t('admins.signup.signup') %></div>
<% end %>
-<%= render :partial => "devise/shared/links" %>
+<%= render :partial => "admins/shared/links" %>
-<h2>Sign in</h2>
+<h2><%= t('admins.signin.title') %></h2>
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
<div><%= f.label :email %><br />
<div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
<% end -%>
- <div><%= f.submit "Sign in" %></div>
+ <div><%= f.submit t('admins.signin.signin') %></div>
<% end %>
-<%= render :partial => "admins/shared/links" %>
\ No newline at end of file
+<%= render :partial => "admins/shared/links" %>
<%- if controller_name != 'sessions' %>
- <%= link_to "Sign in", new_session_path(resource_name) %><br />
+ <%= link_to t('admins.shared.signin'), new_session_path(resource_name) %><br />
<% end -%>
<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
- <%= link_to "Sign up", new_registration_path(resource_name) %><br />
+ <%= link_to t('admins.shared.signup'), new_registration_path(resource_name) %><br />
<% end -%>
<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
- <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+ <%= link_to t('admins.shared.forgot'), new_password_path(resource_name) %><br />
<% end -%>
<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
<%- resource_class.omniauth_providers.each do |provider| %>
<%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
<% end -%>
-<% end -%>
\ No newline at end of file
+<% end -%>
<h1><%= t '.title' -%></h1>\r
+<p id="notice"><%= notice %></p>\r
\r
<h2><%= t('comics.top.user_resources') -%></h2>\r
<table>\r
-<h2>Sign up</h2>
+<h2><%= t('demand_users.signup.title') %></h2>
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
<%= devise_error_messages! %>
<div><%= f.label :password_confirmation %><br />
<%= f.password_field :password_confirmation %></div>
- <div><%= f.submit "Sign up" %></div>
+ <div><%= f.submit t('demand_users.signup.signup') %></div>
<% end %>
-<%= render :partial => "devise/shared/links" %>
+<%= render :partial => "demand_users/shared/links" %>
-<h2>Sign in</h2>
+<h2><%= t('demand_users.signin.title') %></h2>
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
<div><%= f.label :email %><br />
<div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
<% end -%>
- <div><%= f.submit "Sign in" %></div>
+ <div><%= f.submit t('demand_users.signin.signin') %></div>
<% end %>
-<%= render :partial => "devise/shared/links" %>
\ No newline at end of file
+<%= render :partial => "demand_users/shared/links" %>
<%- if controller_name != 'sessions' %>
- <%= link_to "Sign in", new_session_path(resource_name) %><br />
+ <%= link_to t('demand_users.shared.signin'), new_session_path(resource_name) %><br />
<% end -%>
<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
- <%= link_to "Sign up", new_registration_path(resource_name) %><br />
+ <%= link_to t('demand_users.shared.signup'), new_registration_path(resource_name) %><br />
<% end -%>
<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
- <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+ <%= link_to t('demand_users.shared.forgot'), new_password_path(resource_name) %><br />
<% end -%>
<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
<%- resource_class.omniauth_providers.each do |provider| %>
<%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
<% end -%>
-<% end -%>
\ No newline at end of file
+<% end -%>
<%= t(MagicNumber['demander_status_status_items'][@demander.demander_status.status].first) %>
</p>
-<%= link_to 'Edit', edit_demander_path(@demander) %>
+<%= link_to t('link.edit'), edit_demander_path(@demander) %>
<%= link_to t('link.back'), demanders_path %>
-<%= form_tag( {:controller => 'panels',:action => "create"}) do %>
+<%= form_for(@panel) do |f| %>
<%= render 'system/error_explanation', :obj => @panel %>
+
<div>
<label for="json">json data</label>
</div>
<div>
<%= submit_tag t('panels.create_from_json') -%>
</div>
-<% end -%>
+<% end %>
<table class="no-border" style="margin: 0px; padding: 0px; width=100%">
<tr>
<td>
- <%= link_to panel_icon(:object => story.panel, :size => 25), panel_path(story.panel) %>
- <%= link_to author_icon(:object => story.panel.author, :size => 17), author_path(story.panel.author) %>
- <%= distance_of_time_in_words_to_now story.panel.updated_at %>
+ <% if story.panel -%>
+ <%= link_to panel_icon(:object => story.panel, :size => 25), panel_path(story.panel) %>
+ <%= link_to author_icon(:object => story.panel.author, :size => 17), author_path(story.panel.author) %>
+ <%= distance_of_time_in_words_to_now story.panel.updated_at %>
+ <% end %>
</td>
<td>
<%= link_to story_icon(:object => story, :size => 25), story_path(story) %>
<h1><%= t '.title' -%></h1>
+<p id="notice"><%= notice %></p>
<%= render 'comic_header', :comic => @comic, :author => @author %>
<% if @stories.empty? -%>
<h2><%= t('stories.comic.empty') %></h2>
<% else %>
<% @stories.each do |story| %>
- <%= render 'panels/body', :panel => story.panel, :author => @author %>
+ <% if story.panel -%>
+ <%= render 'panels/body', :panel => story.panel, :author => @author %>
+ <% end %>
<%= render 'footer', :story => story, :author => @author %>
<% end %>
<%= render 'licensed_pictures', :licensed_pictures => Story.licensed_pictures(@stories) %>
invalid_t: コマ要素の話順が不正です。
not_convert: Gif画像へのコンバートに失敗しました。
invalid_image: 画像として読み込めませんでした。
+ flash:
+ notice:
+ created: '%{model}が作成されました。'
+ updated: '%{model}が更新されました。'
+ destroyed: '%{model}が削除されました。'
+ not_created: '%{model}の作成に失敗しました。'
+ not_updated: '%{model}の更新に失敗しました。'
+ not_destroyed: '%{model}の削除に失敗しました。'
activerecord:
models:
user: ユーザ
+ admin: 管理者
+ demand_user: 借手
comic: コミック
story: ストーリー
panel: コマ
current_password: 現在のパスワード
remember_me: 次回から自動でログイン
authentication_token: 認証トークン
+ admin:
+ email: メールアドレス
+ password: パスワード
+ password_confirmation: 確認パスワード
+ current_password: 現在のパスワード
+ remember_me: 次回から自動でログイン
+ authentication_token: 認証トークン
demand_user:
email: メールアドレス
password: パスワード
forgot:
title: パスワードを忘れてしまった
reset: 新しいパスワードを発行する
+ admins:
+ shared:
+ signin: ログイン
+ signup: 新規入会
+ forgot: パスワードを忘れた
+ signup:
+ title: 管理者登録
+ signup: 登録する
+ signin:
+ title: ログイン
+ signin: ログイン
+ edit:
+ title: アカウントの設定変更
+ forgot:
+ title: パスワードを忘れてしまった
+ reset: 新しいパスワードを発行する
+ users:
+ shared:
+ signin: ログイン
+ signup: 新規入会
+ forgot: パスワードを忘れた
+ signup:
+ title: ユーザ登録
+ signup: 登録する
+ signin:
+ title: ログイン
+ signin: ログイン
+ edit:
+ title: アカウントの設定変更
+ forgot:
+ title: パスワードを忘れてしまった
+ reset: 新しいパスワードを発行する
+ demand_users:
+ shared:
+ signin: ログイン
+ signup: 新規入会
+ forgot: パスワードを忘れた
+ signup:
+ title: ユーザ登録
+ signup: 登録する
+ signin:
+ title: ログイン
+ signin: ログイン
+ edit:
+ title: アカウントの設定変更
+ forgot:
+ title: パスワードを忘れてしまった
+ reset: 新しいパスワードを発行する
home:
index:
title: ホーム
to_provider: 貸手に切り替える
wait: 待機中の貸手の借受状況だけを表示する
all: すべての貸手の借受状況を表示する
+ flash:
+ notice:
+ created: 借受を開始しました。
+ not_created: 借受を開始できませんでした。
+ stopped: 借受を停止しました。
+ not_stopped: 借受を停止できませんでした。
demanders:
index:
title: 借手一覧
edit:
title: 借手編集
status: 状態
+ flash:
+ notice:
+ not_found: サイトプロフィールを登録してください。
+ requested: 借受申請しました。
+ not_requested: 借受申請できませんでした。
+ stopped: 借受を停止しました。
+ not_stopped: 借受を停止できませんでした。
demander_statuses:
index:
title: 貸与状況一覧
open: 開く
wait: 申請中の借手の貸与状況だけを表示する
all: すべての借手の貸与状況を表示する
+ flash:
+ notice:
+ rejected: 貸与を否決しました。
+ not_rejected: 貸与を否決できませんでした。
+ approved: 貸与を承認しました。
+ not_approved: 貸与を承認できませんでした。
provider_licenses:
index:
title: ライセンス対照表一覧
r[@pp.picture_id].should eq @p
r[@pp2.picture_id].should eq @p2
end
+ context 'コマが削除されているときき' do
+ before do
+ @panel2.destroy
+ end
+ it '削除されているコマは無視する' do
+ r = Story.licensed_pictures [@story, @story2]
+ r.is_a?(Hash).should be_true
+ r.should have(1).items
+ r[@pp.picture_id].should eq @p
+ r[@pp2.picture_id].should be_nil
+ end
+ end
end
describe 't補充値に於いて' do
OSDN Git Service
