Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add new feature to Translate(): Replace/Translate parameters #494

Open
wants to merge 6 commits into
base: dev
Choose a base branch
from
Open

Add new feature to Translate(): Replace/Translate parameters #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ad92f2c
Add new feature to Translate(): Replace/Translate parameters for tran…
reneeb Sep 13, 2023
7a42e3e
Merge branch 'dev' into reneeb_translate_replace_parameters
dennykorsukewitz Oct 18, 2023
cc8e10d
Merge branch 'dev' into reneeb_translate_replace_parameters
dennykorsukewitz Nov 23, 2023
7ff5722
Merge branch 'dev' into reneeb_translate_replace_parameters
dennykorsukewitz Feb 6, 2024
6b27280
Merge branch 'dev' into reneeb_translate_replace_parameters
dennykorsukewitz Aug 22, 2024
b22784e
Merge branch 'dev' into reneeb_translate_replace_parameters
dennykorsukewitz Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Kernel/Language.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,16 @@ sub Translate {

$Text = $Self->{Translation}->{$Text} || $Text;

my $SubRef;

if ( ref $Text && 'ARRAY' eq ref $Text ) {
($Text, $SubRef) = @{ $Text || [] };
}

return $Text if !@Parameters;

@Parameters = $SubRef->( @Parameters ) if $SubRef && ref $SubRef && 'CODE' eq ref $SubRef;

for my $Count ( 0 .. $#Parameters ) {
return $Text if !defined $Parameters[$Count];
$Text =~ s/\%(s|d)/$Parameters[$Count]/;
Expand Down
15 changes: 15 additions & 0 deletions scripts/test/Language.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,4 +238,19 @@ for my $Test (@Tests) {
);
}

{
$LanguageObject->{Translation}->{"This is a test for a new feature in Translate(). - %s %s"} = [ 'A simple Test - %s %s', \&ReplaceParams ];
my $Translated = $LanguageObject->Translate("This is a test for a new feature in Translate(). - %s %s", "Znuny", "rocks!");

$Self->Is(
$Translated,
'A simple Test - Perl is great!',
'Replaced params for translated string',
);

sub ReplaceParams {
return "Perl", "is great!";
}
}

1;
Loading