From: yasushiito Date: Thu, 12 Jun 2014 22:56:54 +0000 (+0900) Subject: fix any X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=commitdiff_plain;h=ec0c2a22f45b11ac8c447e9be7ef6a846983c581 fix any --- diff --git a/config/locales/pettanr.ja.yml b/config/locales/pettanr.ja.yml index e95d272f..2f639066 100644 --- a/config/locales/pettanr.ja.yml +++ b/config/locales/pettanr.ja.yml @@ -178,7 +178,7 @@ ja: speech_balloon: panel_id: コマ speech_balloon_template_id: フキダシテンプレート - speech_balloon_template_classname: フキダシクラス名 + speech_balloon_template_module_name: フキダシモジュール名 z: 重なり t: 話順 caption: 様子 @@ -188,9 +188,9 @@ ja: speech: speech_balloon_id: フキダシ speech_balloon_template_id: フキダシテンプレート - speech_balloon_template_classname: フキダシクラス名 + speech_balloon_template_module_name: フキダシモジュール名 writing_format_id: 記法 - writing_format_classname: 記法クラス名 + writing_format_module_name: 記法モジュール名 content: セリフ font_size: 基本フォントサイズ text_align: テキスト揃え @@ -207,7 +207,7 @@ ja: balloon: speech_balloon_id: フキダシ speech_balloon_template_id: フキダシテンプレート - speech_balloon_template_classname: フキダシクラス名 + speech_balloon_template_module_name: フキダシモジュール名 system_picture_id: 画像 x: X y: Y @@ -264,7 +264,7 @@ ja: license_group_settings: ライセンスフラグ credit_picture_settings: クレジット拡張データ license_settings: ライセンス拡張データ - license_group_classname: ライセンスクラス名 + license_group_module_name: ライセンスモジュール名 created_at: 公開日時 updated_at: 公開日時 resource_picture: @@ -280,7 +280,7 @@ ja: license_group_settings: ライセンスフラグ credit_picture_settings: クレジット拡張データ license_settings: ライセンス拡張データ - license_group_classname: ライセンスクラス名 + license_group_module_name: ライセンスモジュール名 picture_id: 実素材 created_at: 作成 updated_at: 更新 @@ -291,7 +291,7 @@ ja: updated_at: 更新 speech_balloon_template: name: 管理名 - classname: クラス名 + module_name: モジュール名 caption: 名前 t: 並び順 system_picture_id: アイコン @@ -300,7 +300,7 @@ ja: updated_at: 更新 writing_format: name: 管理名 - classname: クラス名 + module_name: モジュール名 caption: 名前 t: 並び順 system_picture_id: アイコン @@ -309,14 +309,14 @@ ja: updated_at: 更新 license_group: name: 管理名 - classname: クラス名 + module_name: モジュール名 caption: 名前 url: URL created_at: 作成 updated_at: 更新 license: license_group_id: ライセンスグループ - license_group_classname: ライセンスクラス名 + license_group_module_name: ライセンスモジュール名 name: 管理名 caption: 名前 url: URL diff --git a/public/local_manifest.json b/public/local_manifest.json index 84a1125b..f62ce44e 100644 --- a/public/local_manifest.json +++ b/public/local_manifest.json @@ -731,7 +731,7 @@ "panel_id", "caption", "speech_balloon_template_id", - "speech_balloon_template_classname", + "speech_balloon_template_module_name", "z", "t", "speech_balloon_template_settings" @@ -756,9 +756,9 @@ "column_names": [ "speech_balloon_id", "speech_balloon_template_id", - "speech_balloon_template_classname", + "speech_balloon_template_module_name", "writing_format_id", - "writing_format_classname", + "writing_format_module_name", "content", "font_size", "text_align", @@ -788,7 +788,7 @@ "column_names": [ "speech_balloon_id", "speech_balloon_template_id", - "speech_balloon_template_classname", + "speech_balloon_template_module_name", "system_picture_id", "x", "y", @@ -886,7 +886,7 @@ "license_group_settings", "credit_picture_settings", "license_settings", - "license_group_classname" + "license_group_module_name" ], "associations": { "belongs_to": [ @@ -930,7 +930,7 @@ "credit_picture_settings", "license_settings", "picture_id", - "license_group_classname" + "license_group_module_name" ], "associations": { "belongs_to": [ @@ -947,7 +947,7 @@ }, "column_names": [ "name", - "classname", + "module_name", "caption", "t", "system_picture_id", @@ -1027,7 +1027,7 @@ }, "column_names": [ "name", - "classname", + "module_name", "caption", "system_picture_id", "settings" @@ -1048,7 +1048,7 @@ "license_group": { "column_names": [ "name", - "classname", + "module_name", "caption", "url" ], @@ -1287,7 +1287,7 @@ }, "column_names": [ "license_group_id", - "license_group_classname", + "license_group_module_name", "name", "caption", "system_picture_id", @@ -2555,7 +2555,7 @@ "type": "hidden" } }, - "speech_balloon_template_classname": { + "speech_balloon_template_module_name": { "label": { "type": "none" }, @@ -2572,7 +2572,7 @@ "id", "panel_id", "speech_balloon_template_id", - "speech_balloon_template_classname", + "speech_balloon_template_module_name", "z", "t", "speech_balloon_template_settings" @@ -2647,7 +2647,7 @@ }, "row_break": true }, - "speech_balloon_template_classname": { + "speech_balloon_template_module_name": { "label": { "type": "none" }, @@ -2669,7 +2669,7 @@ "speech_balloon_id", "system_picture_id", "speech_balloon_template_id", - "speech_balloon_template_classname", + "speech_balloon_template_module_name", "speech_balloon_template_settings" ] }, @@ -2783,7 +2783,7 @@ } } }, - "speech_balloon_template_classname": { + "speech_balloon_template_module_name": { "label": { "type": "none" }, @@ -2791,7 +2791,7 @@ "type": "hidden" } }, - "writing_format_classname": { + "writing_format_module_name": { "label": { "type": "none" }, @@ -2825,9 +2825,9 @@ "width", "height", "speech_balloon_template_id", - "speech_balloon_template_classname", + "speech_balloon_template_module_name", "speech_balloon_template_settings", - "writing_format_classname", + "writing_format_module_name", "writing_format_settings" ] }, @@ -3018,7 +3018,7 @@ }, "row_break": true }, - "classname": { + "module_name": { "tag": { "type": "text" }, @@ -3052,7 +3052,7 @@ "field_names": [ "id", "name", - "classname", + "module_name", "caption", "t", "system_picture_id", @@ -3075,7 +3075,7 @@ }, "row_break": true }, - "classname": { + "module_name": { "tag": { "type": "text" }, @@ -3103,7 +3103,7 @@ "field_names": [ "id", "name", - "classname", + "module_name", "caption", "system_picture_id", "settings" @@ -3125,7 +3125,7 @@ }, "row_break": true }, - "classname": { + "module_name": { "tag": { "type": "text" }, @@ -3147,7 +3147,7 @@ "field_names": [ "id", "name", - "classname", + "module_name", "caption", "url" ] @@ -3170,7 +3170,7 @@ "type": "hidden" } }, - "license_group_classname": { + "license_group_module_name": { "tag": { "type": "text" }, @@ -3210,7 +3210,7 @@ "field_names": [ "id", "license_group_id", - "license_group_classname", + "license_group_module_name", "name", "caption", "system_picture_id", @@ -3946,7 +3946,7 @@ "id", "panel_id", "speech_balloon_template_id", - "speech_balloon_template_classname", + "speech_balloon_template_module_name", "z", "t", "speech_balloon_template_settings", @@ -3959,7 +3959,7 @@ "balloon.speech_balloon_id", "balloon.system_picture_id", "balloon.speech_balloon_template_id", - "balloon.speech_balloon_template_classname", + "balloon.speech_balloon_template_module_name", "balloon.speech_balloon_template_settings", "speech.writing_format_id", "speech.font_size", @@ -3974,9 +3974,9 @@ "speech.width", "speech.height", "speech.speech_balloon_template_id", - "speech.speech_balloon_template_classname", + "speech.speech_balloon_template_module_name", "speech.speech_balloon_template_settings", - "speech.writing_format_classname", + "speech.writing_format_module_name", "speech.writing_format_settings" ] }, diff --git a/script/ls_helper.rb b/script/ls_helper.rb index df63671f..bd44f970 100644 --- a/script/ls_helper.rb +++ b/script/ls_helper.rb @@ -20,8 +20,8 @@ lg.each do |k, g| puts k g['licenses_attributes'].each do |lk, l| puts lk - puts 'follow license_group_classname' + g['classname'] - l['license_group_classname'] = g['classname'] + puts 'follow license_group_module_name' + g['module_name'] + l['license_group_module_name'] = g['module_name'] if l['license_group_settings'] puts 'license_group_settings to json' end