tweaks to resource matching, back out localize stuff just added, a=chris
tweaks to resource matching, back out localize stuff just added, a=chris
diff --git a/src/library/media_jobs/DescriptionUpdateJob.php b/src/library/media_jobs/DescriptionUpdateJob.php
index 6fd35faef..2eb0ce83d 100644
--- a/src/library/media_jobs/DescriptionUpdateJob.php
+++ b/src/library/media_jobs/DescriptionUpdateJob.php
@@ -288,8 +288,8 @@ class DescriptionUpdateJob extends MediaJob
}
if (!$found_details && !$test_mode) {
file_put_contents($thumb_folder_path .
- "/$resource_detail.txt",
- L\tl('descriptionupdate_no_description_found'));
+ "/$resource_detail.txt", "Description search sources".
+ " failed to find description.");
}
$i++;
}
@@ -313,6 +313,10 @@ class DescriptionUpdateJob extends MediaJob
public function matchResourceSourcePathTerms($page_name_resource_path,
$source_term_string)
{
+ $page_name_resource_path = preg_replace("/\_/u", " ",
+ $page_name_resource_path);
+ $source_term_string = preg_replace("/\_/u", " ",
+ $source_term_string);
$mime_type = L\mimeType($page_name_resource_path, true);
$mime_type_major = explode("/", $mime_type)[0];
$check_parts = explode("/", mb_strtolower($page_name_resource_path));
diff --git a/src/models/LocaleModel.php b/src/models/LocaleModel.php
index 9a5692214..cbaf4126d 100755
--- a/src/models/LocaleModel.php
+++ b/src/models/LocaleModel.php
@@ -90,8 +90,7 @@ class LocaleModel extends Model
* Directories to try to extract translatable identifier strings from
* @var array
*/
- public $extract_dirs = ["controllers", "views", "library/indexing_plugins",
- "library/media_jobs"];
+ public $extract_dirs = ["controllers", "views", "library/indexing_plugins"];
/**
* File extensions of files to try to extract translatable strings from
* @var array