Skip to content

Commit

Permalink
Issue #3728: removes unwanted whitespace-trimming for AdminTranslations
Browse files Browse the repository at this point in the history
  • Loading branch information
@MichaelThumes @svenoe
MichaelThumes authored and svenoe committed Sep 5, 2024
1 parent 88e4b75 commit 5c04fd3
Showing 1 changed file with 81 additions and 43 deletions.
124 changes: 81 additions & 43 deletions Kernel/Modules/AdminTranslations.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,24 @@ sub Run {
LanguageID => $ParamObject->GetParam( Param => 'LanguageID' )
);

# ------------------------------------------------------------ #
# Delete
# ------------------------------------------------------------ #
}

# ------------------------------------------------------------ #
# Delete
# ------------------------------------------------------------ #
elsif ( $Self->{Subaction} eq 'Delete' ) {
$Param{ID} = $ParamObject->GetParam( Param => 'DeleteID' ) || '';
$Param{UserLanguage} = $ParamObject->GetParam( Param => 'LanguageID' ) || '';
$Param{MarkForDelete} = $ParamObject->GetParam( Param => 'Mark' ) || '';
$Param{Content} = $ParamObject->GetParam( Param => 'Content' ) || '';
$Param{Translation} = $ParamObject->GetParam( Param => 'Translation' ) || '';

$Param{ID} = $ParamObject->GetParam( Param => 'DeleteID' ) || '';
$Param{UserLanguage} = $ParamObject->GetParam( Param => 'LanguageID' ) || '';
$Param{MarkForDelete} = $ParamObject->GetParam( Param => 'Mark' ) || '';
$Param{Content} = $ParamObject->GetParam(
Param => 'Content',
Raw => 1
) || '';
$Param{Translation} = $ParamObject->GetParam(
Param => 'Translation',
Raw => 1
) || '';

my $Success;
my $Message = '';
Expand Down Expand Up @@ -141,7 +149,10 @@ sub Run {
# ------------------------------------------------------------ #
elsif ( $Self->{Subaction} eq 'UndoDelete' ) {
$Param{UserLanguage} = $ParamObject->GetParam( Param => 'LanguageID' ) || '';
$Param{Content} = $ParamObject->GetParam( Param => 'Content' ) || '';
$Param{Content} = $ParamObject->GetParam(
Param => 'Content',
Raw => 1
) || '';
my $Success;

if ( $Param{UserLanguage} && $Param{Content} ) {
Expand Down Expand Up @@ -183,9 +194,15 @@ sub Run {
my $Output = $LayoutObject->Header();
$Output .= $LayoutObject->NavigationBar();

$GetParam{ID} = $ParamObject->GetParam( Param => 'ID' ) || '';
$GetParam{Content} = $ParamObject->GetParam( Param => 'EditContent' ) || '';
$GetParam{Translation} = $ParamObject->GetParam( Param => 'EditTranslation' ) || '';
$GetParam{ID} = $ParamObject->GetParam( Param => 'ID' ) || '';
$GetParam{Content} = $ParamObject->GetParam(
Param => 'EditContent',
Raw => 1
) || '';
$GetParam{Translation} = $ParamObject->GetParam(
Param => 'EditTranslation',
Raw => 1
) || '';
$GetParam{UserLanguage} = $ParamObject->GetParam( Param => 'LanguageID' )
|| $ParamObject->GetParam( Param => 'UserLanguage' ) || '';

Expand Down Expand Up @@ -235,13 +252,18 @@ sub Run {
# Loop over change additions
CHANGEADDITION:
for ( my $Count = 1; $Count <= $Param{CountNew}; $Count++ ) {
my $Content = $ParamObject->GetParam( Param => 'TranslateInput_Content_Change_' . $Count ) || '';
my $OldTranslation = $ParamObject->GetParam( Param => 'TranslateInput_Old_Change_' . $Count ) || '';
my $NewTranslation = $ParamObject->GetParam( Param => 'TranslateInput_Change_' . $Count ) || '';

$Content =~ s/^\s+|\s+$//g;
$OldTranslation =~ s/^\s+|\s+$//g;
$NewTranslation =~ s/^\s+|\s+$//g;
my $Content = $ParamObject->GetParam(
Param => 'TranslateInput_Content_Change_' . $Count,
Raw => 1
) || '';
my $OldTranslation = $ParamObject->GetParam(
Param => 'TranslateInput_Old_Change_' . $Count,
Raw => 1
) || '';
my $NewTranslation = $ParamObject->GetParam(
Param => 'TranslateInput_Change_' . $Count,
Raw => 1
) || '';

next CHANGEADDITION if $OldTranslation eq $NewTranslation;

Expand All @@ -264,13 +286,18 @@ sub Run {
# Change existing draft translations
DRAFTCHANGES:
for my $ID (@ChangeIDs) {
my $Content = $ParamObject->GetParam( Param => 'TranslateInput_Content_' . $ID );
my $OldTranslation = $ParamObject->GetParam( Param => 'TranslateInput_Old_' . $ID );
my $NewTranslation = $ParamObject->GetParam( Param => 'TranslateInput_' . $ID );

$Content =~ s/^\s+|\s+$//g;
$OldTranslation =~ s/^\s+|\s+$//g;
$NewTranslation =~ s/^\s+|\s+$//g;
my $Content = $ParamObject->GetParam(
Param => 'TranslateInput_Content_' . $ID,
Raw => 1
);
my $OldTranslation = $ParamObject->GetParam(
Param => 'TranslateInput_Old_' . $ID,
Raw => 1
);
my $NewTranslation = $ParamObject->GetParam(
Param => 'TranslateInput_' . $ID,
Raw => 1
);

next DRAFTCHANGES if $OldTranslation eq $NewTranslation;

Expand All @@ -289,13 +316,18 @@ sub Run {
}
}
else {
$Param{Content} = $ParamObject->GetParam( Param => 'Content' ) || '';
$Param{Translation} = $ParamObject->GetParam( Param => 'Translation' ) || '';
$Param{OldTranslation} = $ParamObject->GetParam( Param => 'OldTranslation' ) || '';

$Param{Content} =~ s/^\s+|\s+$//g;
$Param{Translation} =~ s/^\s+|\s+$//g;
$Param{OldTranslation} =~ s/^\s+|\s+$//g;
$Param{Content} = $ParamObject->GetParam(
Param => 'Content',
Raw => 1
) || '';
$Param{Translation} = $ParamObject->GetParam(
Param => 'Translation',
Raw => 1
) || '';
$Param{OldTranslation} = $ParamObject->GetParam(
Param => 'OldTranslation',
Raw => 1
) || '';

my $Success;

Expand Down Expand Up @@ -418,11 +450,14 @@ sub Run {
};

if ( $Param{Object} eq 'GeneralLabel' || ( $Param{Object} eq 'DynamicFieldLabel' && $Param{DynamicFieldID} ne 'ListAll' ) ) {
$Param{Content} = $ParamObject->GetParam( Param => 'Content' );
$Param{Translation} = $ParamObject->GetParam( Param => 'Translation' );

$Param{Content} =~ s/^\s+|\s+$//g;
$Param{Translation} =~ s/^\s+|\s+$//g;
$Param{Content} = $ParamObject->GetParam(
Param => 'Content',
Raw => 1
);
$Param{Translation} = $ParamObject->GetParam(
Param => 'Translation',
Raw => 1
);

if ( !$UniqueValues{ $Param{Content} } ) {

Expand All @@ -448,11 +483,14 @@ sub Run {
else {
# Loop over field data
for ( my $Count = 1; $Count <= $Param{ItemCount}; $Count++ ) {
my $Content = $ParamObject->GetParam( Param => 'TranslateInput_Content_' . $Count );
my $Translation = $ParamObject->GetParam( Param => 'TranslateInput_' . $Count );

$Content =~ s/^\s+|\s+$//g;
$Translation =~ s/^\s+|\s+$//g;
my $Content = $ParamObject->GetParam(
Param => 'TranslateInput_Content_' . $Count,
Raw => 1
);
my $Translation = $ParamObject->GetParam(
Param => 'TranslateInput_' . $Count,
Raw => 1
);

if ( $Content && $Translation && !$UniqueValues{$Content} ) {
my $Success = $TranslationsObject->DraftTranslationsAdd(
Expand Down

0 comments on commit 5c04fd3

Please sign in to comment.