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

Generating import report for source language #115

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Generating import report for source language #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ef121f
Generating import report for source language
icnocop Mar 13, 2019
12f681e
Fixed source language report filename and indicated source language i…
icnocop Mar 14, 2019
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
2 changes: 1 addition & 1 deletion lib/Serge/Command/import.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ $html
];
foreach my $lang (sort keys %{$importer->{stats}}) {
my $stats = $importer->{stats}->{$lang};
$lang = 'source language' if $lang eq '';
$lang = $lang.' (source language)' if $lang eq $importer->{job}->{source_language};
push @$data, [$lang, $stats->{files}, $stats->{notices}, $stats->{warnings}, $stats->{errors}];
}
print_formatted_table($data);
Expand Down
148 changes: 47 additions & 101 deletions lib/Serge/Importer.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ sub process_job {

$self->run_callbacks('before_update_database_from_source_files');

$self->{current_lang} = '';
$self->{current_lang} = $job->{source_language};

$self->update_database_from_source_files;

Expand All @@ -79,8 +79,8 @@ sub parse_localized_files {
sub parse_localized_files_for_file {
my ($self, $file) = @_;

$self->{stats}->{''} = {} unless exists $self->{stats}->{''};
$self->{stats}->{''}->{files}++;
$self->{stats}->{$self->{job}->{source_language}} = {} unless exists $self->{stats}->{$self->{job}->{source_language}};
$self->{stats}->{$self->{job}->{source_language}}->{files}++;

print "\t$file\n";

Expand Down Expand Up @@ -120,13 +120,7 @@ sub parse_localized_files_for_file_lang {
print "\t\t$fullpath\n";

if (!-f $fullpath) {
$self->_notice("Missing localized file for '$lang' language", "\t\t\t");
if ($self->{save_report}) {
push @{$self->{current_report_key}}, {
severity => 'notice',
error_status => 'SERGE_NOTICE_FILE_MISSING'
};
}
$self->_notice("Missing localized file for '$lang' language", "\t\t\t", 'SERGE_NOTICE_FILE_MISSING');
return;
}

Expand All @@ -146,13 +140,7 @@ sub parse_localized_files_for_file_lang {
};

if ($@) {
$self->_error("File parsing failed; the file will not be processed in full; reason: $@", "\t\t\t", 1); # non-fatal
if ($self->{save_report}) {
push @{$self->{current_report_key}}, {
severity => 'error',
error_status => 'SERGE_ERROR_PARSING_FAILED'
};
}
$self->_error("File parsing failed; the file will not be processed in full; reason: $@", "\t\t\t", 1, 'SERGE_ERROR_PARSING_FAILED', '', $lang); # non-fatal
}
}

Expand All @@ -178,18 +166,11 @@ sub parse_source_file_callback {

if ($key eq '' && !$self->{disambiguate_keys}) {
$self->_error("Parser plugin didn't provide a key value in a callback. ".
"Importing translations with this plugin is not possible, unless you use `--disambiguate-keys` option.", "\t\t\t");
"Importing translations with this plugin is not possible, unless you use `--disambiguate-keys` option.", "\t\t\t", '', $key, $string, '', $lang);
}

if ($string eq '') {
$self->_notice("Source string for key '$key' is blank, skipping", "\t\t");
if ($self->{save_report}) {
push @{$self->{current_report_key}}, {
key => $key,
severity => 'error',
error_status => 'SERGE_NOTICE_EMPTY_SOURCE'
};
}
$self->_notice("Source string for key '$key' is blank, skipping [$lang]", "\t\t", 'SERGE_NOTICE_EMPTY_SOURCE', $key);
return;
}

Expand All @@ -200,18 +181,9 @@ sub parse_source_file_callback {
if ($self->{disambiguate_keys}) {
my $orig_key = $key;
$key = $self->disambiguate_key($keys, $key);
$self->_notice("Duplicate key '$orig_key' found in source file, changed to '$key'", "\t\t\t");
$self->_notice("Duplicate key '$orig_key' found in source file, changed to '$key' [$lang]", "\t\t\t", 'SERGE_NOTICE_DUPLICATE_KEY', $key, $string, '', $lang);
} else {
$self->_error("Duplicate key '$key' found in source file", "\t\t\t", 1); # non-fatal

if ($self->{save_report}) {
push @{$self->{current_report_key}}, {
key => $key,
source => $string,
severity => 'error',
error_status => 'SERGE_ERROR_DUPLICATE_KEY'
};
}
$self->_error("Duplicate key '$key' found in source file [$lang]", "\t\t\t", 1, 'SERGE_ERROR_DUPLICATE_KEY', $key, $string, '', $lang); # non-fatal
}
}

Expand Down Expand Up @@ -251,30 +223,9 @@ sub parse_localized_file_callback {
$source = $data->{string} if $data;

if ($translation eq $self->{previous_translation}->{$key}) {
$self->_warning("Duplicate key '$key' with the same translation found in localized file [$lang]", "\t\t\t", 1); # non-fatal

if ($self->{save_report}) {
push @{$self->{current_report_key}}, {
key => $key,
source => $source,
translation => $translation,
severity => 'warning',
error_status => 'SERGE_WARNING_DUPLICATE_KEY'
};
}

$self->_warning("Duplicate key '$key' with the same translation found in localized file [$lang]", "\t\t\t", 'SERGE_WARNING_DUPLICATE_KEY', $key, $source, $translation, $lang);
} else {
$self->_error("Duplicate key '$key' with different translations found in localized file [$lang]", "\t\t\t", 1); # non-fatal

if ($self->{save_report}) {
push @{$self->{current_report_key}}, {
key => $key,
source => $source,
translation => $translation,
severity => 'error',
error_status => 'SERGE_ERROR_MULTIPLE_TRANSLATIONS'
};
}
$self->_error("Duplicate key '$key' with different translations found in localized file [$lang]", "\t\t\t", 1, 'SERGE_ERROR_MULTIPLE_TRANSLATIONS', $key, $source); # non-fatal
}

return $translation;
Expand All @@ -292,56 +243,22 @@ sub parse_localized_file_callback {
my $data = $self->{job}->{source_keys}->{$self->{current_file_rel}}->{$key};

if (!$data) {
$self->_warning("Unknown key '$key'", "\t\t\t");

if ($self->{save_report}) {
push @{$self->{current_report_key}}, {
key => $key,
lang => $lang,
severity => 'warning',
error_status => 'SERGE_WARNING_UNKNOWN_KEY',
translation => $translation
};
}
$self->_warning("Unknown key '$key' [$lang]", "\t\t\t", 'SERGE_WARNING_UNKNOWN_KEY', $key, '', $translation, $lang);

return $translation;
}

my $item_id = $data->{item};

if (($translation eq '') && ($data->{string} ne '')) {
$self->_notice("Translation for key '$key' is blank, skipping", "\t\t\t");
if ($self->{save_report}) {
push @{$self->{current_report_key}}, {
key => $key,
severity => 'notice',
error_status => 'SERGE_NOTICE_EMPTY_TRANSLATION'
};
}
$self->_notice("Translation for key '$key' is blank, skipping [$lang]", "\t\t\t", 'SERGE_NOTICE_EMPTY_TRANSLATION', $key);
return;
}

if ($data->{string} ne $translation) {
if ($self->{save_report}) {
push @{$self->{current_report_key}}, {
key => $key,
lang => $lang,
source => $data->{string},
translation => $translation
};
}
$self->_save_report($key, $lang, $data->{string}, $translation);
} else {
$self->_notice("Translation is the same as the source for key '$key'", "\t\t\t");
if ($self->{save_report}) {
push @{$self->{current_report_key}}, {
key => $key,
lang => $lang,
severity => 'notice',
error_status => 'SERGE_NOTICE_SAME_TRANSLATION',
source => $data->{string},
translation => $translation
};
}
$self->_notice("Translation is the same as the source for key '$key' [$lang]", "\t\t\t", 'SERGE_NOTICE_SAME_TRANSLATION', $key, $data->{string}, $translation, $lang);
}

print "\t\t\t::localized file [$lang]: '$key' => '$translation'\n" if $self->{debug};
Expand All @@ -352,25 +269,54 @@ sub parse_localized_file_callback {
}

sub _notice {
my ($self, $s, $indent_prefix) = @_;
my ($self, $s, $indent_prefix, $error_status, $key, $source, $translation, $lang) = @_;

print $indent_prefix."NOTICE: $s\n";
$self->{stats}->{$self->{current_lang}}->{notices}++;

$self->_save_report($key, $lang, $source, $translation, 'notice', $error_status);
}

sub _warning {
my ($self, $s, $indent_prefix) = @_;
my ($self, $s, $indent_prefix, $error_status, $key, $source, $translation, $lang) = @_;

print $indent_prefix."WARNING: $s\n";
$self->{stats}->{$self->{current_lang}}->{warnings}++;

$self->_save_report($key, $lang, $source, $translation, 'warning', $error_status);
}

sub _error {
my ($self, $s, $indent_prefix, $nonfatal) = @_;
my ($self, $s, $indent_prefix, $nonfatal, $error_status, $key, $source, $translation, $lang) = @_;

print $indent_prefix."ERROR: $s\n";
$self->{stats}->{$self->{current_lang}}->{errors}++;

$self->_save_report($key, $lang, $source, $translation, 'error', $error_status);

exit(1) unless $nonfatal;
}

sub _save_report {
my ($self, $key, $lang, $source, $translation, $severity, $error_status) = @_;

if (!$self->{save_report}) {
return;
}

$self->{report} = {} unless exists $self->{report};
$self->{report}->{$self->{current_lang}} = {} unless exists $self->{report}->{$self->{current_lang}};
$self->{report}->{$self->{current_lang}}->{$self->{current_file_rel}} = [] unless exists $self->{report}->{$self->{current_lang}}->{$self->{current_file_rel}};
$self->{current_report_key} = $self->{report}->{$self->{current_lang}}->{$self->{current_file_rel}};

push @{$self->{current_report_key}}, {
key => $key,
lang => $lang,
source => $source,
translation => $translation,
severity => $severity,
error_status => $error_status
};
}

1;