Merge branch 'master' of github.com:potsky/laravel-localization-helpers

potsky · Oct 3, 2014 · f912a5d · f912a5d
2 parents cdc750e + e426908
commit f912a5d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -131,7 +131,23 @@ else
 fi
 ```
 
+##### Simulate all operations (do not write anything) with a dry run
 
+```
+php artisan localization:missing -r
+```
+
+##### Open all must-edit files at the end of the process
+
+```
+php artisan localization:missing -e
+```
+
+You can edit the editor path in your configuration file. By default, editor is *Sublime Text* on *Mac OS X* :
+
+```
+    'editor_command_line' => '/Applications/Sublime\\ Text.app/Contents/SharedSupport/bin/subl'
+```
 
 ### Command `localization:find`
 

diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     "license" : "GPL-3.0+",
     "require" : {
         "php"                : ">=5.3.0",
-        "illuminate/support" : "~4.1"
+        "illuminate/support" : ">=4.1"
     },
     "autoload" : {
         "classmap" : [

diff --git a/src/Potsky/LaravelLocalizationHelpers/Commands/LocalizationMissing.php b/src/Potsky/LaravelLocalizationHelpers/Commands/LocalizationMissing.php
@@ -316,18 +316,24 @@ public function fire()
                 }
 
                 $this->line( 'Save files:' );
+                $open_files = '';
                 foreach ($job as $file_lang_path => $file_content) {
                     if ( ! $this->option( 'dry-run' ) ) {
                         file_put_contents( $file_lang_path , $file_content );
                     }
                     $this->line( "    <info>" . $this->get_short_path( $file_lang_path ) );
                     if ( $this->option('editor') ) {
-                        exec( $this->editor . ' ' . $file_lang_path );
+                        $open_files.= ' ' . escapeshellarg( $file_lang_path );
                     }
                 }
                 $this->line( '' );
 
                 $this->info( 'Process done!' );
+
+                if ( $this->option('editor') ) {
+                    exec( $this->editor . $open_files );
+                }
+
             } else {
                 $this->line( '' );
                 $this->comment( 'Process aborted. No file have been changed.' );

diff --git a/src/config/config.php b/src/config/config.php
@@ -53,6 +53,8 @@
 	    'Lang::Get' => array(
 	        '@Lang::Get\(\s*(\'.*\')\s*(,.*)*\)@U',
 	        '@Lang::Get\(\s*(".*")\s*(,.*)*\)@U',
+	        '@Lang::get\(\s*(\'.*\')\s*(,.*)*\)@U',
+	        '@Lang::get\(\s*(".*")\s*(,.*)*\)@U',
 	    ),
 	    'trans_choice' => array(
 	        '@trans_choice\(\s*(\'.*\')\s*,.*\)@U',