Issue #3658: Renaming parameter and tidying.

RotherOSS · Jul 31, 2024 · 7483b37 · 7483b37
1 parent a82d813
commit 7483b37
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 25 deletions.
diff --git a/Kernel/Modules/AdminTranslations.pm b/Kernel/Modules/AdminTranslations.pm
@@ -526,8 +526,7 @@ sub Run {
 
         my $Message;
         my $Success = $TranslationsObject->WriteTranslationFile(
-            UserLanguage         => $Param{UserLanguage},
-            TranslateParentChild => 1,
+            UserLanguage => $Param{UserLanguage},
         ) || 0;
 
         if ( $Success == 1 ) {
@@ -1195,7 +1194,6 @@ sub _GetDraftTable {
             %ObjectList = $Kernel::OM->Get('Kernel::System::Type')->TypeList( Valid => 0 );
         }
 
-        # NOTE it is important that uniq is placed outside of sort because else sort will mistake it as sorting function
         ROW:
         for my $Row ( uniq sort values %ObjectList ) {
 

diff --git a/Kernel/System/ImportExport/ObjectBackend/Translations.pm b/Kernel/System/ImportExport/ObjectBackend/Translations.pm
@@ -636,9 +636,8 @@ sub ImportDataSave {
         }
 
         $Success = $TranslationsObject->WriteTranslationFile(
-            UserLanguage         => $Language,
-            Import               => 0,
-            TranslateParentChild => 1,
+            UserLanguage => $Language,
+            Import       => 0,
         ) || 0;
 
         if ( !$Success ) {

diff --git a/Kernel/System/Queue.pm b/Kernel/System/Queue.pm
@@ -933,7 +933,6 @@ sub QueueAdd {
         );
     }
 
-    # NOTE valid defaults to 1
     my %Queues = $Self->QueueList();
 
     # generate chained translations automatically
@@ -1268,7 +1267,6 @@ sub QueueUpdate {
         }
     }
 
-    # NOTE valid defaults to 1
     my %Queues = $Self->QueueList();
 
     # generate chained translations automatically

diff --git a/Kernel/System/Service.pm b/Kernel/System/Service.pm
@@ -678,7 +678,6 @@ sub ServiceAdd {
         Type => $Self->{CacheType},
     );
 
-    # NOTE valid defaults to 1
     my %Services = $Self->ServiceList(
         UserID => $Param{UserID},
     );
@@ -845,7 +844,6 @@ sub ServiceUpdate {
         Type => $Self->{CacheType},
     );
 
-    # NOTE valid defaults to 1
     my %Services = $Self->ServiceList(
         UserID => $Param{UserID},
     );

diff --git a/Kernel/System/Translations.pm b/Kernel/System/Translations.pm
@@ -595,10 +595,10 @@ sub ReadExistingTranslationFile {
 write translation file
 
     my $Success = $TranslationsObject->WriteTranslationFile(
-        UserLanguage         => 'en',
-        Data                 => { .. } #Hash of Content/Translation values,
-        Import               => (0|1),
-        TranslateParentChild => (0|1),      # if automatic translation of parent-child strings should be performed. Default is 1
+        UserLanguage  => 'en',
+        Data          => { .. }     # Hash of Content/Translation values,
+        Import        => (0|1),
+        NoParentChild => (0|1),     # if automatic translation of parent-child strings should be performed. Default is 0
     );
 
 Returns:
@@ -623,10 +623,8 @@ sub WriteTranslationFile {
     my $Data                = '';
     my $BreakLineAfterChars = 60;
     my $Home                = $Kernel::OM->Get('Kernel::Config')->Get('Home');
-    $Param{Import} ||= 0;
-
-    # NOTE intentionally using undef or
-    $Param{TranslateParentChild} //= 1;
+    $Param{Import}        ||= 0;
+    $Param{NoParentChild} ||= 0;
 
     #Check if there are draft translations to write
     my @DraftTranslations = @{
@@ -856,15 +854,13 @@ EOF
         $Success = 1;
     }
 
-    if ( $Param{TranslateParentChild} ) {
+    if ( !$Param{NoParentChild} ) {
 
-        # NOTE valid defaults to 1
         my %Queues  = $Kernel::OM->Get('Kernel::System::Queue')->QueueList();
         my @Strings = values %Queues;
 
         if ( $Kernel::OM->Get('Kernel::Config')->Get('Ticket::Service') ) {
 
-            # NOTE valid defaults to 1
             my %Services = $Kernel::OM->Get('Kernel::System::Service')->ServiceList(
                 UserID => 1,
             );
@@ -967,8 +963,6 @@ sub TranslateParentChildElements {
     # use given language, else use all system languages
     my @Languages = $Param{LanguageID} ? ( $Param{LanguageID} ) : ( keys %{ $Kernel::OM->Get('Kernel::Config')->Get('DefaultUsedLanguages') } );
 
-    return unless @Languages;
-
     # iterate over languages
     for my $LanguageID (@Languages) {
 
@@ -1018,8 +1012,8 @@ sub TranslateParentChildElements {
         # check if language need to be deployed to prevent recursive deployment
         if ($DeployLanguage) {
             my $DeploySuccess = $Self->WriteTranslationFile(
-                UserLanguage         => $LanguageID,
-                TranslateParentChild => 0,
+                UserLanguage  => $LanguageID,
+                NoParentChild => 1,
             );
         }