Merge pull request #8890 from jdarwood007/3.0/DetailedVersions

[3.0] Detailed version fixes for Languages

Author: jdarwood007

Languages/en_US/Calendar.php

@@ -1,6 +1,6 @@
 <?php
 
-// Version: 3.0 Alpha 4; General
+// Version: 3.0 Alpha 4; Calendar
 
 $txt['birthdays'] = 'Birthdays:';
 $txt['events'] = 'Events:';

Sources/Actions/Admin/ACP.php

@@ -1477,9 +1477,6 @@ public static function getServerVersions(array $checkFor): array
 	 */
 	public static function getFileVersions(array &$versionOptions): array
 	{
-		// Default place to find the languages would be the default theme dir.
-		$lang_dir = Theme::$current->settings['default_theme_dir'] . '/languages';
-
 		$version_info = [
 			'root_versions' => [],
 			'file_versions' => [],
@@ -1530,6 +1527,8 @@ public static function getFileVersions(array &$versionOptions): array
 			Config::$sourcedir . '/minify/*',
 			Config::$sourcedir . '/ReCaptcha/*',
 			Config::$sourcedir . '/Tasks/*',
+			Config::$sourcedir . '/ZxcvbnPhp/*',
+			Config::$sourcedir . '/Unicode/*',
 		];
 
 		foreach ($sources_dir as $filename => $file) {
@@ -1616,31 +1615,37 @@ public static function getFileVersions(array &$versionOptions): array
 		}
 
 		// Load up all the files in the default language directory and sort by language.
-		$this_dir = dir($lang_dir);
+		$langauges_dir = new \RecursiveIteratorIterator(
+			new \RecursiveDirectoryIterator(
+				Config::$boarddir . '/Languages',
+				\RecursiveDirectoryIterator::SKIP_DOTS,
+			),
+		);
 
-		while ($entry = $this_dir->read()) {
-			if (str_ends_with($entry, '.php') && $entry != 'index.php' && !is_dir($lang_dir . '/' . $entry)) {
-				// Read the first 768 bytes from the file.... enough for the header.
-				$fp = fopen($lang_dir . '/' . $entry, 'rb');
-				$header = fread($fp, 768);
-				fclose($fp);
+		foreach ($langauges_dir as $filename => $file) {
+			if (!$file->isFile() || $file->getFilename() === 'index.php' || $file->getExtension() !== 'php') {
+				continue;
+			}
 
-				// Split the file name off into useful bits.
-				list($name, $language) = explode('.', $entry);
+			$language = basename(\dirname($filename));
+			$short_name = $file->getBasename('.' . $file->getExtension());
+			$name = $file->getBasename();
 
-				// Look for the version comment in the file header.
-				if (preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*' . preg_quote($name, '~') . '(?:[\s]{2}|\*/)~i', $header, $match) == 1) {
-					$version_info['default_language_versions'][$language][$name] = $match[1];
-				}
-				// It wasn't found, but the file was... show a '??'.
-				else {
-					$version_info['default_language_versions'][$language][$name] = '??';
-				}
+			// Read the first 768 bytes from the file.... enough for the header.
+			$fp = $file->openFile('rb');
+			$header = $fp->fread(768);
+			$fp = null;
+
+			// Look for the version comment in the file header.
+			if (preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*' . preg_quote($short_name, '~') . '(?:[\s]{2}|\*/|$)~i', $header, $match) == 1) {
+				$version_info['default_language_versions'][$language][$name] = $match[1];
+			}
+			// It wasn't found, but the file was... show a '??'.
+			else {
+				$version_info['default_language_versions'][$language][$name] = '??';
 			}
 		}
 
-		$this_dir->close();
-
 		// Sort the file versions by filename.
 		if (!empty($versionOptions['sort_results'])) {
 			ksort($version_info['file_versions']);

Themes/default/Admin.template.php

@@ -469,13 +469,13 @@ function template_view_versions()
 			echo '
 									<tr class="windowbg">
 										<td class="half_table">
-											', $filename, '.<em>', $language, '</em>.php
+											<em>', $language, '</em>/', $filename, '
 										</td>
 										<td class="quarter_table">
-											<em id="your', $filename, '.', $language, '">', $version, '</em>
+											<em id="yourLanguage_', $language, '_', $filename, '">', $version, '</em>
 										</td>
 										<td class="quarter_table">
-											<em id="current', $filename, '.', $language, '">??</em>
+											<em id="currentLanguage_', $language, '_', $filename, '">??</em>
 										</td>
 									</tr>';
 	}
@@ -580,8 +580,8 @@ function template_view_versions()
 					<script>
 						var oViewVersions = new smf_ViewVersions({
 							aKnownLanguages: [
-								\'.', implode('\',
-								\'.', Utils::$context['default_known_languages']), '\'
+								\'', implode('\',
+								\'', Utils::$context['default_known_languages']), '\'
 							],
 							oSectionContainerIds: {
 								Sources: \'Sources\',

Themes/default/scripts/admin.js

@@ -286,13 +286,14 @@ smf_ViewVersions.prototype.determineVersions = function ()
 	{
 		for (var i = 0; i < this.opt.aKnownLanguages.length; i++)
 		{
-			if (!document.getElementById('current' + sFilename + this.opt.aKnownLanguages[i]))
+			if (!document.getElementById('currentLanguage_' + this.opt.aKnownLanguages[i] + '_' + sFilename))
 				continue;
 
-			setInnerHTML(document.getElementById('current' + sFilename + this.opt.aKnownLanguages[i]), smfLanguageVersions[sFilename]);
+			setInnerHTML(document.getElementById('currentLanguage_' + this.opt.aKnownLanguages[i] + '_' + sFilename), smfLanguageVersions[sFilename]);
 
-			sYourVersion = getInnerHTML(document.getElementById('your' + sFilename + this.opt.aKnownLanguages[i]));
-			setInnerHTML(document.getElementById('your' + sFilename + this.opt.aKnownLanguages[i]), sYourVersion);
+			console.log('yourLanguage_' + this.opt.aKnownLanguages[i] + '_' +sFilename);
+			sYourVersion = getInnerHTML(document.getElementById('yourLanguage_' + this.opt.aKnownLanguages[i] + '_' +sFilename));
+			setInnerHTML(document.getElementById('yourLanguage_' + this.opt.aKnownLanguages[i] + '_' + sFilename), sYourVersion);
 
 			if ((this.compareVersions(oHighYour.Languages, sYourVersion) || oHighYour.Languages == '??') && !oLowVersion.Languages)
 				oHighYour.Languages = sYourVersion;
@@ -302,7 +303,7 @@ smf_ViewVersions.prototype.determineVersions = function ()
 			if (this.compareVersions(sYourVersion, smfLanguageVersions[sFilename]))
 			{
 				oLowVersion.Languages = sYourVersion;
-				document.getElementById('your' + sFilename + this.opt.aKnownLanguages[i]).style.color = 'red';
+				document.getElementById('yourLanguage_' + this.opt.aKnownLanguages[i] + '_' + sFilename).style.color = 'red';
 			}
 		}
 	}