pettanr_pettan_public_v01_licenses 0.0.6 → 0.0.7

data/app/views/pettanr_pettan_public_v01_licenses/attributes/_confirm.html.erb

@@ -1,8 +1,8 @@
 <div>
-<h2>digest credit</h2>
+<h2><%= t('pettanr_pettan_public_v01_licenses.digest_credit') -%></h2>
 <%= render @resource_picture.credit_template, :picture => @resource_picture %>
 </div>
 <div>
-<h2>full credit</h2>
+<h2><%= t('pettanr_pettan_public_v01_licenses.full_credit') -%></h2>
 <%= render @resource_picture.full_credit_template, :picture => @resource_picture %>
 </div>

data/app/views/pettanr_pettan_public_v01_licenses/attributes/_form.html.erb

@@ -5,41 +5,31 @@
   end
  %>
 <%= form_tag('/pettanr_pettan_public_v01_licenses/attributes') do %>
-  <% if @pettan_public_license.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(@pettan_public_license.errors.count, "error") %> prohibited this comic from being saved:</h2>
-
-      <ul>
-      <% @pettan_public_license.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-      </ul>
-    </div>
-  <% end %>
+  <%= render 'system/error_explanation', :obj => @pettan_public_license %>
 
   <table class="no-border">
     <tr>
-      <td>License Group</td>
+      <td><%= t_m 'LicenseGroup' -%></td>
       <td><%= h @license_group.caption -%></td>
-      <td>selected</td>
+      <td><%= t('pettanr_pettan_public_v01_licenses.selected') -%></td>
     </tr>
     <tr>
-      <td>License</td>
+      <td><%= t_m 'PettanrPettanPublicV01Licenses::Attribute.license_id' -%></td>
       <td><%= collection_select :pettan_public_license, :license_id, @license_group.licenses.map {|l| [l.caption, l.id] }, :last, :first -%></td>
-      <td>+</td>
+      <td><%= t('pettanr_pettan_public_v01_licenses.no_blank') -%></td>
     </tr>
     <tr>
-      <td>Artist Name</td>
+      <td><%= t_m 'PettanrPettanPublicV01Licenses::Attribute.artist_name' -%></td>
       <td><%= text_field_tag 'pettan_public_license[artist_name]', @pettan_public_license.artist_name -%></td>
-      <td>+</td>
+      <td><%= t('pettanr_pettan_public_v01_licenses.no_blank') -%></td>
     </tr>
     <tr>
-      <td>Caption</td>
+      <td><%= t_m 'PettanrPettanPublicV01Licenses::Attribute.caption' -%></td>
       <td><%= text_field_tag 'pettan_public_license[caption]', @pettan_public_license.caption -%></td>
       <td></td>
     </tr>
     <tr>
-      <td>source picture's url</td>
+      <td><%= t_m 'PettanrPettanPublicV01Licenses::Attribute.sources' -%></td>
       <td><%= text_area_tag 'pettan_public_license[sources]', @pettan_public_license.sources -%></td>
       <td></td>
     </tr>
@@ -50,6 +40,6 @@
   <%= hidden_field_tag 'original_picture_license_group[license_group_id]', @original_picture_license_group.license_group_id %>
 
   <div class="actions">
-    <%= submit_tag 'Next' %>
+    <%= submit_tag  t('pettanr_pettan_public_v01_licenses.next') %>
   </div>
 <% end %>

data/app/views/pettanr_pettan_public_v01_licenses/attributes/_full_credit.html.erb

@@ -13,23 +13,23 @@
     </td>
   </tr>
   <tr>
-    <td>Artist Name</td>
-    <td><%= h(picture.artist_name) -%></td>
-  </tr>
-  <tr>
-    <td>License Group</td>
+    <td><%= t_m 'PettanrPettanPublicV01Licenses::Attribute' -%></td>
     <td><%= link_to(h(picture.license.license_group.caption), picture.license.license_group.url) -%></td>
   </tr>
   <tr>
-    <td>License</td>
+    <td><%= t_m 'PettanrPettanPublicV01Licenses::Attribute.license_id' -%></td>
     <td><%= link_to(h(picture.license.caption), picture.license.url) -%></td>
   </tr>
   <tr>
-    <td>Caption</td>
+    <td><%= t_m 'PettanrPettanPublicV01Licenses::Attribute.artist_name' -%></td>
+    <td><%= h(picture.artist_name) -%></td>
+  </tr>
+  <tr>
+    <td><%= t_m 'PettanrPettanPublicV01Licenses::Attribute.caption' -%></td>
     <td><%= h picture.credit_data['caption'] -%></td>
   </tr>
   <tr>
-    <td>source picture's url</td>
+    <td><%= t_m 'PettanrPettanPublicV01Licenses::Attribute.sources' -%></td>
     <td>
       <% picture.credit_data['sources'].to_s.gsub(/\r/, '').split(/\n/).each do |url| -%>
         <div><%= link_to(h(url), url) -%></div>

data/app/views/pettanr_pettan_public_v01_licenses/attributes/_note.html.erb

@@ -1,2 +1 @@
-<h1>Select license (and more info)</h1>
-<img src="<%= @original_picture.url -%>">
+<%= tag(:img, @original_picture.opt_img_tag) -%>

data/app/views/pettanr_pettan_public_v01_licenses/attributes/new.html.erb

@@ -1,2 +1,3 @@
+<h1><%= t('pettanr_pettan_public_v01_licenses.title') %></h1>
 <%= render 'pettanr_pettan_public_v01_licenses/attributes/note' %>
 <%= render 'pettanr_pettan_public_v01_licenses/attributes/form' %>

data/config/locales/pettanr_pettan_public_v01_licenses.ja.yml

@@ -0,0 +1,18 @@
+ja:
+  activerecord:
+    models:
+      pettanr_pettan_public_v01_licenses/attribute: ぺったんパブリック0.1
+    attributes:
+      pettanr_pettan_public_v01_licenses/attribute:
+          license_id: ライセンス
+          artist_name: 著作者名
+          caption: 作品のタイトル
+          sources: 元作品のurl
+  pettanr_pettan_public_v01_licenses:
+    title: 画像の公開(ライセンスの選択)
+    selected: 選択されています
+    no_blank: 必須項目
+    next: 次へ
+    digest_credit: クレジット
+    full_credit: クレジット完全版
+

data/lib/pettanr_pettan_public_v01_licenses/version.rb

@@ -1,3 +1,3 @@
 module PettanrPettanPublicV01Licenses
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pettanr_pettan_public_v01_licenses
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &24735816 !ruby/object:Gem::Requirement
+  requirement: &23368548 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *24735816
+  version_requirements: *23368548
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &24735048 !ruby/object:Gem::Requirement
+  requirement: &23368068 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24735048
+  version_requirements: *23368068
 description: This software is a license plugin for PettanR
 email:
 - yasusiito@gmail.com
@@ -57,6 +57,7 @@ files:
 - app/views/pettanr_pettan_public_v01_licenses/attributes/_form.html.erb
 - app/views/pettanr_pettan_public_v01_licenses/attributes/_full_credit.html.erb
 - app/views/pettanr_pettan_public_v01_licenses/attributes/_note.html.erb
+- config/locales/pettanr_pettan_public_v01_licenses.ja.yml
 - config/routes.rb
 - db/b1.png
 - db/migrate/20121008012741_create_pettanr_pettan_public_v01_licenses_attributes.rb