Merge branch 'lang_ja' of git://github.com/mzdakr/invoiceninja into mzdakr-lang_ja

Conflicts:
	app/Providers/AppServiceProvider.php
	database/seeds/CurrenciesSeeder.php

app/Providers/AppServiceProvider.php

@@ -24,8 +24,13 @@ class AppServiceProvider extends ServiceProvider {
         });
 
         Form::macro('nav_link', function($url, $text, $url2 = '', $extra = '') {
+            $capitalize = config('former.capitalize_translations');
             $class = ( Request::is($url) || Request::is($url.'/*') || Request::is($url2.'/*') ) ? ' class="active"' : '';
-            $title = ucwords(trans("texts.$text")) . Utils::getProLabel($text);
+            if ($capitalize) {
+              $title = ucwords(trans("texts.$text")) . Utils::getProLabel($text);
+            } else {
+              $title = trans("texts.$text")  . Utils::getProLabel($text);
+            }
             return '<li'.$class.'><a href="'.URL::to($url).'" '.$extra.'>'.$title.'</a></li>';
         });
 

config/former.php

@@ -49,7 +49,7 @@
 
     // Whether text that comes out of the translated
     // should be capitalized (ex: email => Email) automatically
-    'capitalize_translations' => true,
+    'capitalize_translations' => false,
 
     // An array of attributes to automatically translate
     'translatable'            => array(

database/seeds/CountriesSeeder.php

@@ -108,6 +108,10 @@ class CountriesSeeder extends Seeder {
                 'swap_postal_code' => true,
                 'swap_currency_symbol' => true,
             ],
+            'JP' => [ // Japan
+                'swap_postal_code' => true,
+                'swap_currency_symbol' => true,
+            ],
             'LT' => [ // Lithuania
                 'swap_currency_symbol' => true,
             ],

database/seeds/CurrenciesSeeder.php

@@ -53,6 +53,7 @@ class CurrenciesSeeder extends Seeder
             ['name' => 'Romanian New Leu', 'code' => 'RON', 'symbol' => '', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
             ['name' => 'Croatian Kuna', 'code' => 'HKR', 'symbol' => 'kn', 'precision' => '2', 'thousand_separator' => '.', 'decimal_separator' => ','],
             ['name' => 'Saudi Riyal', 'code' => 'SAR', 'symbol' => '', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['name' => 'Japanese Yen', 'code' => 'JPY', 'symbol' => '¥', 'precision' => '0', 'thousand_separator' => ',', 'decimal_separator' => '.'],
         ];
 
         foreach ($currencies as $currency) {

database/seeds/FontsSeeder.php

@@ -220,6 +220,28 @@ class FontsSeeder extends Seeder
                 'bolditalics' => 'UKai.ttf',
                 'sort_order' => 1800,
             ],
+            [
+                'folder' => 'gensha_gothic_p',
+                'name' => 'GenshinGothic P - Japanese',
+                'css_stack' => '',
+                'google_font' => '',
+                'normal' => 'GenShinGothic-P-Regular.ttf',
+                'bold' => 'GenShinGothic-P-Regular.ttf',
+                'italics' => 'GenShinGothic-P-Regular.ttf',
+                'bolditalics' => 'GenShinGothic-P-Regular.ttf',
+                'sort_order' => 1800,
+            ],
+            [
+                'folder' => 'gensha_gothic',
+                'name' => 'GenshinGothic - Japanese',
+                'css_stack' => '',
+                'google_font' => '',
+                'normal' => 'GenShinGothic-Regular.ttf',
+                'bold' => 'GenShinGothic-Regular.ttf',
+                'italics' => 'GenShinGothic-Regular.ttf',
+                'bolditalics' => 'GenShinGothic-Regular.ttf',
+                'sort_order' => 1800,
+            ],
         ];
 
         foreach ($fonts as $font) {

public/fonts/invoice-fonts/gensha_gothic/SIL_Open_Font_License_1.1.txt

@@ -0,0 +1,91 @@
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

public/fonts/invoice-fonts/gensha_gothic_p/SIL_Open_Font_License_1.1.txt

@@ -0,0 +1,91 @@
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

resources/lang/ja/pagination.php

@@ -0,0 +1,20 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Pagination Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used by the paginator library to build
+    | the simple pagination links. You are free to change them to anything
+    | you want to customize your views to better match your application.
+    |
+    */
+
+    'previous' => '&laquo; 前へ',
+
+    'next'     => '次へ &raquo;',
+
+);

resources/lang/ja/passwords.php

@@ -0,0 +1,22 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    "password" => "パスワードは６文字以上必要です。またパスワードの確認と一致している必要があります。",
+    "user" => "そのEメールアドレスのユーザは存在しません。",
+    "token" => "このパスワード・リセット・トークンは正しくありません。",
+    "sent" => "パスワードリセットのためのリンクをメールしました！",
+    "reset" => "パスワードはリセットされました！",
+
+];

resources/lang/ja/reminders.php

@@ -0,0 +1,24 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    "password" => "パスワードは６文字以上必要です。またパスワードの確認と一致している必要があります。",
+
+    "user" => "そのEメールアドレスのユーザは存在しません。",
+
+    "token" => "このパスワード・リセット・トークンは正しくありません。",
+
+    "sent" => "パスワードリマインダーが送信されました！",
+
+);

resources/lang/ja/validation.php

@@ -0,0 +1,106 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | such as the size rules. Feel free to tweak each of these messages.
+    |
+    */
+
+    "accepted"         => ":attribute はmust be accepted.",
+    "active_url"       => ":attribute は正しいURLではありません。",
+    "after"            => ":attribute は:date以降の日付である必要があります。",
+    "alpha"            => ":attribute は半角英字のみ可能です。",
+    "alpha_dash"       => ":attribute は半角英数字およびハイフンのみ可能です。",
+    "alpha_num"        => ":attribute は半角英数字のみ可能です。",
+    "array"            => "The :attribute must be an array.",
+    "before"           => ":attribute は:date以前の日付である必要があります。",
+    "between"          => array(
+        "numeric" => ":attribute は :min - :max の範囲です。",
+        "file"    => ":attribute は :min - :max KBの範囲です。",
+        "string"  => ":attribute は :min - :max 文字の範囲です。",
+        "array"   => ":attribute は :min - :max 個の範囲です。",
+    ),
+    "confirmed"        => "The :attribute confirmation does not match.",
+    "date"             => "The :attribute is not a valid date.",
+    "date_format"      => "The :attribute does not match the format :format.",
+    "different"        => "The :attribute and :other must be different.",
+    "digits"           => "The :attribute must be :digits digits.",
+    "digits_between"   => "The :attribute must be between :min and :max digits.",
+    "email"            => "The :attribute format is invalid.",
+    "exists"           => "The selected :attribute is invalid.",
+    "image"            => "The :attribute must be an image.",
+    "in"               => "The selected :attribute is invalid.",
+    "integer"          => "The :attribute must be an integer.",
+    "ip"               => "The :attribute must be a valid IP address.",
+    "max"              => array(
+        "numeric" => ":attribute は:max 以下の必要があります。",
+        "file"    => ":attribute は:max KB以下の必要があります。",
+        "string"  => ":attribute は:max 文字以下の必要があります。",
+        "array"   => ":attribute は:max 個以下の必要があります。",
+    ),
+    "mimes"            => ":attribute は以下のファイル・タイプの必要があります。 :values.",
+    "min"              => array(
+        "numeric" => ":attribute は:min 以上の必要があります。",
+        "file"    => ":attribute は:min KB以上の必要があります。",
+        "string"  => ":attribute は:min 文字以上の必要があります。",
+        "array"   => ":attribute は:min 個以上の必要があります。",
+    ),
+    "not_in"           => "選択された :attribute は正しくありません。",
+    "numeric"          => ":attribute は数値の必要があります。",
+    "regex"            => ":attribute のフォーマットが正しくありません。",
+    "required"         => ":attribute フィールドが必要です。",
+    "required_if"      => ":other が :valueの場合、:attribute フィールドが必要です。",
+    "required_with"    => "The :attribute field is required when :values is present.",
+    "required_without" => "The :attribute field is required when :values is not present.",
+    "same"             => ":attribute と :other が一致していません。",
+    "size"             => array(
+        "numeric" => "The :attribute must be :size.",
+        "file"    => "The :attribute must be :size kilobytes.",
+        "string"  => "The :attribute must be :size characters.",
+        "array"   => "The :attribute must contain :size items.",
+    ),
+    "unique"           => ":attribute は既に使われています。",
+    "url"              => ":attribute のフォーマットが正しくありません。",
+
+    "positive" => "The :attribute must be greater than zero.",
+    "has_credit" => "The client does not have enough credit.",
+    "notmasked" => "The values are masked",
+    "less_than" => "The :attribute must be less than :value",
+    "has_counter" => "The value must contain {\$counter}",
+    "valid_contacts" => "The contact must have either an email or name",
+    "valid_invoice_items" => "The invoice exceeds the maximum amount",
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'custom' => array(),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap attribute place-holders
+    | with something more reader friendly such as E-Mail Address instead
+    | of "email". This simply helps us make messages a little cleaner.
+    |
+    */
+
+    'attributes' => array(),
+
+);