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

Merge branch dev with rel-4.4 #9631

Merged
merged 2 commits into from
Jul 22, 2021
Merged

Merge branch dev with rel-4.4 #9631

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2731747
Skip the empty values in the `abp-translation.json` file.
maliming Jul 22, 2021
2851866
Merge pull request #9630 from abpframework/maliming/TranslateCommand
realLiangshiwei Jul 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/TranslateCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public Task ExecuteAsync(CommandLineArgs commandLineArgs)
Logger.LogInformation("Target culture: " + targetCulture);
Logger.LogInformation("Reference culture: " + referenceCulture);
Logger.LogInformation("Output file: " + outputFile);

if (allValues)
{
Logger.LogInformation("Include all keys");
Expand Down Expand Up @@ -195,8 +195,11 @@ private void ApplyAbpTranslateInfo(string directory, string filename)
var targetText = targetLocalizationInfo.Texts.FirstOrDefault(x => x.Name == text.LocalizationKey);
if (targetText != null)
{
Logger.LogInformation($"Update translation: {targetText.Name} => " + text.Target);
targetText.Value = text.Target;
if (!text.Target.IsNullOrEmpty())
{
Logger.LogInformation($"Update translation: {targetText.Name} => " + text.Target);
targetText.Value = text.Target;
}
}
else
{
Expand Down