Merge pull request #20 from 26B/fix/path-without-locale

26B · Jan 14, 2021 · 0f3beaf · 0f3beaf
2 parents a785725 + 3f21ef1
commit 0f3beaf
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/lib/Config/Project.php b/lib/Config/Project.php
@@ -165,22 +165,25 @@ public function get_path( string $locale ) : string {
 			return $path . "{$locale}.{$this->config['ext']}";
 		}
 
+		$filename_parts = [];
+
 		if ( isset( $this->config['filename'] ) ) {
-			$path .= "{$this->config['filename']}-";
+			$filename_parts[] = "{$this->config['filename']}";
 
 		} elseif ( isset( $this->config['domain'] ) ) {
-			$path .= "{$this->config['domain']}-";
+			$filename_parts[] = "{$this->config['domain']}";
 		}
 
 		if ( ! empty( $locale ) ) {
-			$path .= "{$locale}";
+			$filename_parts[] = "{$locale}";
 		}
 
 		// TODO: Should we only add this if the format/ext is also jed/json?
 		if ( isset( $this->config['js-handle'] ) ) {
-			$path .= "-{$this->config['js-handle']}";
+			$filename_parts[] = "{$this->config['js-handle']}";
 		}
 
+		$path .= implode( '-', $filename_parts );
 		return "{$path}.{$this->config['ext']}";
 	}
 

diff --git a/tests/Config/ProjectTest.php b/tests/Config/ProjectTest.php
@@ -375,7 +375,16 @@ public function getPathData() : array {
 				],
 				'pt_PT',
 				"{$path}pt_PT.{$ext}",
-			]
+			],
+			'Empty locale' => [
+				[
+					'path'   => $path,
+					'ext'    => $ext,
+					'domain' => $domain,
+				],
+				'',
+				"{$path}{$domain}.{$ext}",
+			],
 		];
 	}