Implement 'reuse_fuzzy' option (#69)

EvernoteArchive · Jun 18, 2019 · 386d6af · 386d6af
1 parent e0e3b01
commit 386d6af
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 4 deletions.
diff --git a/doc/sample.serge b/doc/sample.serge
@@ -292,6 +292,13 @@ jobs
         # NO - do not reuse such uncertain translations at all (default)
         reuse_uncertain             NO
 
+        # (BOOLEAN) [OPTIONAL] Should the fuzzy translations be reused?
+        # Note that for the translation to be reusable, it must satisfy
+        # all the reuse_* criteria at the same time.
+        # YES - reuse fuzzy translations (default)
+        # NO - do not reuse fuzzy translations
+        reuse_fuzzy                 YES
+
         # (BOOLEAN) [OPTIONAL] Should the fuzzy flag be set on translations
         # which are copied from other strings?
         # Fuzzy flag indicates that the translation is not final and needs review.

diff --git a/lib/Serge/DB/Cached.pm b/lib/Serge/DB/Cached.pm
@@ -687,7 +687,8 @@ sub preload_properties {
 
 sub find_best_translation {
     my $self = shift;
-    my ($namespace, $filepath, $string, $context, $lang, $allow_orphaned, $allow_multiple_variants) = @_;
+    my ($namespace, $filepath, $string, $context, $lang,
+        $allow_orphaned, $allow_fuzzy, $allow_multiple_variants) = @_;
 
     # Now that we hit the item we have no translation for, and need to query
     # the database for the best translation, preload the portion of the cache
@@ -706,6 +707,7 @@ sub find_best_translation {
     my $variants = {};
     foreach my $hr (values %{$cache->{$skey}}) {
         next if $hr->{orphaned} && !$allow_orphaned;
+        next if $hr->{fuzzy} && !$allow_fuzzy;
         $variants->{$hr->{string}}++;
 
         my $fitness = 0;

diff --git a/lib/Serge/Engine.pm b/lib/Serge/Engine.pm
@@ -39,6 +39,7 @@ sub new {
         output_bom => 1,
         reuse_translations => 1,
         reuse_orphaned => 1,
+        reuse_fuzzy => 1,
         reuse_as_fuzzy_default => 1,
         reuse_as_fuzzy => [],
         reuse_as_not_fuzzy => [],
@@ -228,6 +229,7 @@ sub adjust_job_defaults {
         output_bom
         reuse_translations
         reuse_orphaned
+        reuse_fuzzy
         reuse_as_fuzzy_default
         reuse_as_fuzzy
         reuse_as_not_fuzzy
@@ -1703,7 +1705,10 @@ sub internal_get_translation { # from database
     if ($self->{job}->{reuse_translations}) {
         # Find the best match from other files or namespaces
         my ($translation, $fuzzy, $comment, $multiple_variants) = $self->{db}->find_best_translation(
-            $namespace, $filepath, $string, $context, $lang, $self->{job}->{reuse_orphaned}, $self->{job}->{reuse_uncertain}
+            $namespace, $filepath, $string, $context, $lang,
+            $self->{job}->{reuse_orphaned},
+            $self->{job}->{reuse_fuzzy},
+            $self->{job}->{reuse_uncertain}
         );
 
         if ($multiple_variants && !$self->{job}->{reuse_uncertain}) {

diff --git a/lib/Serge/Engine/Plugin/transform.pm b/lib/Serge/Engine/Plugin/transform.pm
@@ -231,7 +231,9 @@ sub guess_translation {
         my ($translation, $fuzzy, $comment, $multiple_variants) =
             $self->{parent}->{engine}->{db}->find_best_translation(
                 $namespace, $filepath, $candidate, $context, $lang,
-                $self->{parent}->{reuse_orphaned}, $self->{parent}->{reuse_uncertain}
+                $self->{parent}->{reuse_orphaned},
+                $self->{parent}->{reuse_fuzzy},
+                $self->{parent}->{reuse_uncertain}
             );
 
         if ($multiple_variants && !$self->{parent}->{reuse_uncertain}) {
@@ -262,7 +264,9 @@ sub guess_translation {
                 my ($translation, $fuzzy, $comment, $multiple_variants) =
                     $self->{parent}->{engine}->{db}->find_best_translation(
                         $namespace, $filepath, $candidate, $context, $lang,
-                        $self->{parent}->{reuse_orphaned}, $self->{parent}->{reuse_uncertain}
+                        $self->{parent}->{reuse_orphaned},
+                        $self->{parent}->{reuse_fuzzy},
+                        $self->{parent}->{reuse_uncertain}
                     );
 
                 if ($multiple_variants && !$self->{parent}->{reuse_uncertain}) {

diff --git a/lib/Serge/config_schema.serge b/lib/Serge/config_schema.serge
@@ -74,6 +74,7 @@ jobs                                ARRAY
         reuse_translations          BOOLEAN
         reuse_orphaned              BOOLEAN
         reuse_uncertain             BOOLEAN
+        reuse_fuzzy                 BOOLEAN
         reuse_as_fuzzy_default      BOOLEAN
         reuse_as_fuzzy              ARRAY
         reuse_as_not_fuzzy          ARRAY