Merge pull request overtrue#5 from overtrue/v2.1

V 3

Author: overtrue

.php_cs

@@ -0,0 +1,27 @@
+<?php
+
+$header = <<<EOF
+This file is part of the overtrue/laravel-lang.
+
+(c) overtrue <[email protected]>
+
+This source file is subject to the MIT license that is bundled
+with this source code in the file LICENSE.
+EOF;
+
+Symfony\CS\Fixer\Contrib\HeaderCommentFixer::setHeader($header);
+
+return Symfony\CS\Config\Config::create()
+    // use default SYMFONY_LEVEL and extra fixers:
+    ->fixers(array(
+        'header_comment',
+        'short_array_syntax',
+        'ordered_use',
+        'php_unit_construct',
+        'strict_param',
+    ))
+    ->finder(
+        Symfony\CS\Finder\DefaultFinder::create()
+            ->in(__DIR__.'/src')
+    )
+;

README.md

@@ -4,14 +4,27 @@
 
 [中文说明](README_CN.md)
 
-[![Latest Stable Version](https://poser.pugx.org/overtrue/laravel-lang/v/stable.svg)](https://packagist.org/packages/overtrue/laravel-lang) [![Total Downloads](https://poser.pugx.org/overtrue/laravel-lang/downloads.svg)](https://packagist.org/packages/overtrue/laravel-lang) [![Latest Unstable Version](https://poser.pugx.org/overtrue/laravel-lang/v/unstable.svg)](https://packagist.org/packages/overtrue/laravel-lang) [![License](https://poser.pugx.org/overtrue/laravel-lang/license.svg)](https://packagist.org/packages/overtrue/laravel-lang)
+[![For Laravel 5][badge_laravel]][link-github-repo]
+[![For Lumen 5][badge_lumen]][link-github-repo]
+[![Latest Stable Version][badge_stable]][link-packagist]
+[![Latest Unstable Version][badge_unstable]][link-packagist]
+[![Total Downloads][badge_downloads]][link-packagist]
+[![License][badge_license]][link-packagist]
 
-## Install
+# Features
+
+- Laravel 5 & Lumen support.
+- Translations Publisher.
+- Made with 💖.
+
+# Install
 
 ```shell
-$ composer require "overtrue/laravel-lang:~2.0"
+$ composer require "overtrue/laravel-lang:~2.1"
 ```
 
+#### Laraval 5.*
+
 After completion of the above, Replace the `config/app.php` content
 
 ```php
@@ -23,15 +36,32 @@ with:
 Overtrue\LaravelLang\TranslationServiceProvider::class,
 ```
 
-## Configuration
+#### Lumen
+
+Add the following line to `bootstrap/app.php`:
+
+```php
+$app->register(Overtrue\LaravelLang\TranslationServiceProvider::class);
+```
+
+# Configuration
 
+### Laravel
 you can change the locale at `config/app.php`:
 
 ```php
 'locale' => 'zh-CN',
 ```
 
-## Usage
+### Lumen
+
+set locale in `.env` file:
+
+```
+APP_LOCALE=zh-CN
+```
+
+# Usage
 
 There is no difference with the usual usage.
 
@@ -78,15 +108,25 @@ You need only add the partials item what you want.
 ### publish the language files to your project `resources/lang/` directory:
 
 ```shell
-$ php artisan vendor:publish --provider="Overtrue\LaravelLang\TranslationServiceProvider" --tag=resouece
+$ php artisan lang:publish LOCALES {--force}
 ```
 
-or force publish(will overwrite old files):
+examples:
 
 ```shell
-$ php artisan vendor:publish --provider="Overtrue\LaravelLang\TranslationServiceProvider" --tag=resource --force
+$ php artisan lang:publish zh-CN,zh-HK,th,tk
 ```
 
-## License
+# License
 
 MIT
+
+[badge_laravel]:      https://img.shields.io/badge/laravel-5.*-green.svg
+[badge_lumen]:        https://img.shields.io/badge/lumen-5.*-green.svg
+[badge_stable]:       https://img.shields.io/packagist/v/overtrue/laravel-lang.svg
+[badge_unstable]:     https://img.shields.io/packagist/vpre/overtrue/laravel-lang.svg
+[badge_downloads]:    https://img.shields.io/packagist/dt/overtrue/laravel-lang.svg?maxAge=2592000
+[badge_license]:      https://img.shields.io/packagist/l/overtrue/laravel-lang.svg?maxAge=2592000
+
+[link-github-repo]:   https://github.com/overtrue/laravel-lang
+[link-packagist]:   https://packagist.org/packages/overtrue/laravel-lang

README_CN.md

@@ -1,26 +1,28 @@
 # Laravel-lang
 
-Laravel 5 语言包，包含 46 种语言, 基于 [caouecs/Laravel-lang](https://github.com/caouecs/Laravel-lang).
+Laravel 5 语言包，包含 52 种语言, 基于 [caouecs/Laravel-lang](https://github.com/caouecs/Laravel-lang).
 
-## 安装
+[![For Laravel 5][badge_laravel]][link-github-repo]
+[![For Lumen 5][badge_lumen]][link-github-repo]
+[![Latest Stable Version][badge_stable]][link-packagist]
+[![Latest Unstable Version][badge_unstable]][link-packagist]
+[![Total Downloads][badge_downloads]][link-packagist]
+[![License][badge_license]][link-packagist]
 
-```shell
-composer require "overtrue/laravel-lang:1.0.*"
-```
+# Features
 
-或者添加下面一行到你的项目 `composer.json` 中 `require` 部分:
+- Laravel 5 & Lumen support.
+- Translations Publisher.
+- Made with 💖.
 
-```json
-"require": {
-    "overtrue/laravel-lang": "1.0.*"
-}
-```
-然后
+# 安装
 
 ```shell
-composer update
+composer require "overtrue/laravel-lang:~2.1"
 ```
 
+#### Laraval 5.*
+
 完成上面的操作后，将项目文件 `config/app.php` 中的下一行
 
 ```php
@@ -33,17 +35,34 @@ Illuminate\Translation\TranslationServiceProvider::class,
 Overtrue\LaravelLang\TranslationServiceProvider::class,
 ```
 
-即可。
+#### Lumen
+
+在 `bootstrap/app.php` 中添加下面这行:
+
+```php
+$app->register(Overtrue\LaravelLang\TranslationServiceProvider::class);
+```
+
+# 配置
 
-## 配置
+### Laravel
 
 修改项目语言 `config/app.php`：
 
 ```php
 'locale' => 'zh-CN',
 ```
 
-## 使用
+### Lumen
+
+在 `.env` 文件中修改语言：
+```
+APP_LOCALE=zh-CN
+```
+
+
+
+# 使用
 
 和正常使用一样，你如果需要额外添加语言项，请在 `resources/lang/zh-CN/` 下建立你自己的文件即可，也可以建立同样的文件来替换掉默认的语言部分。
 
@@ -85,15 +104,26 @@ return [
 ### 将翻译文件拷贝到你的项目 `resources/lang/` 目录下:
 
 ```shell
-$ php artisan vendor:publish --provider="Overtrue\LaravelLang\TranslationServiceProvider" --tag=resouece
+$ php artisan lang:publish LOCALES {--force}
 ```
 
-当然你也可以强制拷贝(将会覆盖原有同名文件哦):
+examples:
 
 ```shell
-$ php artisan vendor:publish --provider="Overtrue\LaravelLang\TranslationServiceProvider" --tag=resource --force
+$ php artisan lang:publish zh-CN,zh-HK,th,tk
 ```
 
-## License
+# License
 
 MIT
+
+
+[badge_laravel]:      https://img.shields.io/badge/laravel-5.*-green.svg
+[badge_lumen]:        https://img.shields.io/badge/lumen-5.*-green.svg
+[badge_stable]:       https://img.shields.io/packagist/v/overtrue/laravel-lang.svg
+[badge_unstable]:     https://img.shields.io/packagist/vpre/overtrue/laravel-lang.svg
+[badge_downloads]:    https://img.shields.io/packagist/dt/overtrue/laravel-lang.svg?maxAge=2592000
+[badge_license]:      https://img.shields.io/packagist/l/overtrue/laravel-lang.svg?maxAge=2592000
+
+[link-github-repo]:   https://github.com/overtrue/laravel-lang
+[link-packagist]:   https://packagist.org/packages/overtrue/laravel-lang

composer.json

@@ -12,7 +12,8 @@
     "autoload": {
         "psr-4": {
             "Overtrue\\LaravelLang\\": "src/"
-        }
+        },
+        "files": ["src/helpers.php"]
     },
     "license": "MIT",
     "authors": [

src/Commands/Publish.php

@@ -0,0 +1,82 @@
+<?php
+
+/*
+ * This file is part of the overtrue/laravel-lang.
+ *
+ * (c) overtrue <[email protected]>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Overtrue\LaravelLang\Commands;
+
+use Illuminate\Console\Command;
+use Symfony\Component\Process\Process;
+
+class Publish extends Command
+{
+    protected $signature = 'lang:publish
+                            {locales=all : Comma-separated list of, eg: zh_CN,tk,th}
+                            {--force : override existing files.}';
+
+    protected $description = 'publish language files to resources directory.';
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $locale = $this->argument('locales');
+        $force = $this->option('force') ? 'f' : 'n';
+
+        $sourcePath = app()->basePath().'/vendor/caouecs/laravel-lang/src';
+        $targetPath = app()->basePath().'/resources/lang/';
+
+        if (!is_dir($targetPath) || !is_writable($targetPath)) {
+            return $this->error('The lang path "resources/lang/" does not exist or not writable.');
+        }
+
+        $files = [];
+        $published = [];
+
+        if ($locale == 'all') {
+            $files = $sourcePath.'/*';
+            $message = 'all';
+        } else {
+            foreach (explode(',', $locale) as $filename) {
+                $file = $sourcePath.'/'.trim($filename);
+
+                if (!file_exists($file)) {
+                    $this->error("lang '$filename' not found.");
+                    continue;
+                }
+
+                $published[] = $filename;
+                $files[] = $file;
+            }
+
+            $files = implode(' ', $files);
+            $message = json_encode($published);
+        }
+
+        $process = new Process("cp -r{$force} $files $targetPath");
+
+        $process->run(function ($type, $buffer) {
+            if (Process::ERR === $type) {
+                return $this->error(trim($buffer));
+            }
+        });
+
+        $type = ($force == 'f') ? 'no overwrite' : 'overwrite';
+
+        $this->info("published languages <comment>({$type})</comment>: {$message}.");
+    }
+}