Permalink
Browse files

Merge pull request #11 from dog-ears/bugfix_translate_some_japanese_w…

…ord_to_english

bugfix translate some japaneseword to english
  • Loading branch information...
dog-ears committed May 29, 2016
2 parents ae0ffa5 + 077aa5a commit 4a390e140918ff8327934f5133af0a60b0d63ab4
@@ -36,18 +36,18 @@ public function __construct($command, Filesystem $files, $stub_pathname, $schema
public function getCompiled(){
//スタブの取得
//get stab
$stub = $this->files->get($this->stub_pathname);
//アプリ名コンパイル
//compile app name
$this->compileAppName($stub);
//スキーマコンパイル
//compile schema
if( $this->schema_repalce_type ){
$this->compileSchema($stub, $this->schema_repalce_type);
}
//カスタムコンパイル
//custom compile
if( $this->custom_replace ){
$this->compileCustomReplace($stub);
}
@@ -61,7 +61,7 @@ protected function compileAppName(&$stub){
$commandObjNames = explode('\\',get_class($this->commandObj));
$this->commandObjName = end( $commandObjNames );
//config取得
//get config
$app_name_rules = config('CrudDscaffold.app_name_rules');
if( $this->commandObjName === 'MakeRelationCommand' || $this->commandObjName === 'DeleteRelationCommand' ){ //for RelationCommand
@@ -97,12 +97,12 @@ protected function compileAppName(&$stub){
protected function compileSchema(&$stub, $type='migration')
{
//スキーマの取得
//get schema
if ($schema = $this->commandObj->option('schema')) {
$schema = (new SchemaParser)->parse($schema);
}
//状況に応じて、スキーマ処理
//schema in each case
if($type === 'migration'){
// Create migration fields
@@ -5,7 +5,7 @@
<ol class="breadcrumb">
<li><a href="/"><span class="glyphicon glyphicon-home" aria-hidden="true"></span></a></li>
<li><a href="{{ route('{{app_route}}.index') }}">{{app_model_class}}</a></li>
<li class="active">新規登録</li>
<li class="active">Create</li>
</ol>
<div class="page-header">
@@ -5,7 +5,7 @@
<ol class="breadcrumb">
<li><a href="/"><span class="glyphicon glyphicon-home" aria-hidden="true"></span></a></li>
<li><a href="{{ route('{{app_route}}.index') }}">{{app_model_class}}</a></li>
<li class="active">新規登録</li>
<li class="active">Duplicate</li>
</ol>
<div class="page-header">
@@ -6,7 +6,7 @@
<li><a href="/"><span class="glyphicon glyphicon-home" aria-hidden="true"></span></a></li>
<li><a href="{{ route('{{app_route}}.index') }}">{{app_model_class}}</a></li>
<li><a href="{{ route('{{app_route}}.show', ${{app_model_var}}->id) }}">{{ ${{app_model_var}}->name }}</a></li>
<li class="active">編集</li>
<li class="active">Edit</li>
</ol>
<div class="page-header">
@@ -39,13 +39,6 @@ public function prepare()
$cmd = 'php artisan db:seed';
exec($cmd, $output);
//php artisan make:relation AppleType Apple
/*
Artisan::call('make:relation', (array)[
'model_A' => 'AppleType',
'model_B' => 'Apple',
]);
*/
$cmd = 'php artisan make:relation AppleType Apple';
exec($cmd, $output);
}
@@ -39,13 +39,6 @@ public function prepare()
$cmd = 'php artisan db:seed';
exec($cmd, $output);
//php artisan make:relation OrangeType Orange
/*
Artisan::call('make:relation', (array)[
'model_A' => 'OrangeType',
'model_B' => 'Orange',
]);
*/
$cmd = 'php artisan make:relation OrangeType Orange';
exec($cmd, $output);

0 comments on commit 4a390e1

Please sign in to comment.