Skip to content
Sign up
This repository

public / silverstripe-framework Octocat-spinner-32

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

BUGFIX i18nTextCollector finds templates recursively, not only in <mo… 

…dule>/templates folder. Added master language entities which were previously overlooked due to this bug.
  • Loading branch information...
commit f7e19ca680315fc61c5a5c36e8fd133bf1a88d2c 1 parent 42bc5ff
Ingo Schommer authored

Showing 2 changed files with 35 additions and 11 deletions. Show Diff Stats Hide Diff Stats

  1. 22  i18n/i18nTextCollector.php
  2. 24  lang/en.yml
22  i18n/i18nTextCollector.php
View 
@@ -159,8 +159,6 @@ public function run($restrictToModules = null) {
159 159 
 	protected function processModule($module) {
160 160 
 		$entities = array();
161 161
162   
-		//Debug::message("Processing Module '{$module}'", false);
163   
-
164 162 
 		// Search for calls in code files if these exists
165 163 
 		$fileList = array();
166 164 
 		if(is_dir("$this->basePath/$module/code")) {
 
@@ -179,8 +177,9 @@ protected function processModule($module) {
179 177 
 		}
180 178
181 179 
 		// Search for calls in template files if these exists
182   
-		if(is_dir("$this->basePath/$module/templates")) {
183   
-			$fileList = $this->getFilesRecursive("$this->basePath/$module/templates");
  180 
+		if(is_dir("$this->basePath/$module/")) {
  181 
+			$dummy = array();
  182 
+			$fileList = $this->getFilesRecursive("$this->basePath/$module/", $dummy, 'ss');
184 183 
 			foreach($fileList as $index => $filePath) {
185 184 
 				$content = file_get_contents($filePath);
186 185 
 				// templates use their filename as a namespace
 
@@ -302,7 +301,7 @@ public function collectFromTemplate($content, $fileName, $module) {
302 301 
 			$entities[$this->normalizeEntity($entity, $module)] = $spec;
303 302 
 		}
304 303 
 		ksort($entities);
305   
-
  304 
+
306 305 
 		return $entities;
307 306 
 	}
308 307 
 	
@@ -365,8 +364,9 @@ protected function normalizeEntity($fullName, $_namespace = null) {
365 364 
 	 *
366 365 
 	 * @param string $folder base directory to scan (will scan recursively)
367 366 
 	 * @param array $fileList Array where potential files will be added to
  367 
+	 * @param String $type Optional, "php" or "ss"
368 368 
 	 */
369   
-	protected function getFilesRecursive($folder, &$fileList = null) {
  369 
+	protected function getFilesRecursive($folder, &$fileList = null, $type = null) {
370 370 
 		if(!$fileList) $fileList = array();
371 371 
 		$items = scandir($folder);
372 372 
 		$isValidFolder = (
 
@@ -376,9 +376,13 @@ protected function getFilesRecursive($folder, &$fileList = null) {
376 376
377 377 
 		if($items && $isValidFolder) foreach($items as $item) {
378 378 
 			if(substr($item,0,1) == '.') continue;
379   
-			if(substr($item,-4) == '.php') $fileList[substr($item,0,-4)] = "$folder/$item";
380   
-			else if(substr($item,-3) == '.ss') $fileList[$item] = "$folder/$item";
381   
-			else if(is_dir("$folder/$item")) $this->getFilesRecursive("$folder/$item", $fileList);
  379 
+			if(substr($item,-4) == '.php' && (!$type || $type == 'php')) {
  380 
+				$fileList[substr($item,0,-4)] = "$folder/$item";
  381 
+			}
  382 
+			else if(substr($item,-3) == '.ss' && (!$type || $type == 'ss')) {
  383 
+				$fileList[$item] = "$folder/$item";
  384 
+			}
  385 
+			else if(is_dir("$folder/$item")) $this->getFilesRecursive("$folder/$item", $fileList, $type);
382 386 
 		}
383 387 
 		return $fileList;
384 388 
 	}
24  lang/en.yml
View 
@@ -46,6 +46,8 @@ en:
46 46 
     UNORDERED: 'Unordered list'
47 47 
     UNORDEREDDESCRIPTION: 'Unordered list'
48 48 
     UNORDEREDEXAMPLE1: 'unordered item 1'
  49 
+  BackLink_Button.ss:
  50 
+    Back: Back
49 51 
   BasicAuth:
50 52 
     ENTERINFO: 'Please enter a username and password.'
51 53 
     ERRORNOTADMIN: 'That user is not an administrator.'
 
@@ -54,6 +56,8 @@ en:
54 56 
     ANY: Any
55 57 
     NO: No
56 58 
     YES: Yes
  59 
+  CMSLoadingScreen.ss:
  60 
+    LOADING: Loading...
57 61 
   CMSMain:
58 62 
     ACCESS: 'Access to ''{title}'' section'
59 63 
     ACCESSALLINTERFACES: 'Access to all CMS sections'
 
@@ -264,8 +268,13 @@ en:
264 268 
     PERMALREADY: 'I''m sorry, but you can''t access that part of the CMS.  If you want to log in as someone else, do so below'
265 269 
     PERMDEFAULT: 'Please choose an authentication method and enter your credentials to access the CMS.'
266 270 
     PLEASESAVE: 'Please Save Page: This page could not be upated because it hasn''t been saved yet.'
  271 
+    PreviewButton: Preview
267 272 
     SAVED: saved
268 273 
     VersionUnknown: unknown
  274 
+  LeftAndMain.ss:
  275 
+    VIEWPAGEIN: 'Page view:'
  276 
+  LeftAndMain_Menu.ss:
  277 
+    LOGOUT: 'Log out'
269 278 
   LoginAttempt:
270 279 
     Email: 'Email Address'
271 280 
     IP: 'IP Address'
 
@@ -359,7 +368,17 @@ en:
359 368 
     NOCSVFILE: 'Please browse for a CSV file to import'
360 369 
     NOIMPORT: 'Nothing to import'
361 370 
     RESET: Reset
  371 
+    Title: 'Data Models'
362 372 
     UPDATEDRECORDS: 'Updated {count} records.'
  373 
+  ModelAdmin_ImportSpec.ss:
  374 
+    IMPORTSPECFIELDS: 'Database columns'
  375 
+    IMPORTSPECRELATIONS: Relations
  376 
+  ModelAdmin_Tools.ss:
  377 
+    FILTER: Filter
  378 
+    IMPORT: Import
  379 
+  ModelSidebar.ss:
  380 
+    IMPORT_TAB_HEADER: Import
  381 
+    SEARCHLISTINGS: Search
363 382 
   MoneyField:
364 383 
     FIELDLABELAMOUNT: Amount
365 384 
     FIELDLABELCURRENCY: Currency
 
@@ -418,6 +437,9 @@ en:
418 437 
   SecurityAdmin_MemberImportForm:
419 438 
     BtnImport: 'Import from CSV'
420 439 
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
  440 
+  SilverStripeNavigator:
  441 
+    Edit: Edit
  442 
+    OpenNewWindow: 'Open in new window'
421 443 
   SimpleImageField:
422 444 
     NOUPLOAD: 'No Image Uploaded'
423 445 
   SiteTree:
 
@@ -439,8 +461,6 @@ en:
439 461 
     VIEWLAST: 'View last'
440 462 
     VIEWNEXT: 'View next'
441 463 
     VIEWPREVIOUS: 'View previous'
442   
-  TextareaField_Readonly.ss:
443   
-    NONE: none
444 464 
   TimeField:
445 465 
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
446 466 
   ToggleCompositeField.ss:

0 notes on commit f7e19ca

Please sign in to comment.
Something went wrong with that request. Please try again.