Skip to content
This repository has been archived by the owner on Oct 16, 2020. It is now read-only.

Provide localization for Loading Solution Dialog #701

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Provide localization for Loading Solution Dialog #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions data/resources/StringResources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8446,4 +8446,10 @@ Press Esc to cancel this operation.</value>
<data name="ICSharpCode.WpfDesign.AddIn.Options.EnableAppXamlParsing" xml:space="preserve">
<value>Enable App.xaml parsing</value>
</data>
<data name="ICSharpCode.SharpDevelop.Gui.Dialogs.LoadingSolutionForm.Title" xml:space="preserve">
<value>Loading solution...</value>
</data>
<data name="ICSharpCode.SharpDevelop.Gui.Dialogs.LoadingSolutionForm.LoadProject" xml:space="preserve">
<value>Loading ${ProjectName}</value>
</data>
</root>
4 changes: 2 additions & 2 deletions src/Main/SharpDevelop/Project/ProjectService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ void OpenSolutionOrProjectInternal(FileName fileName)
void OpenSolutionInternal(FileName fileName)
{
ISolution solution;
using (var progress = AsynchronousWaitDialog.ShowWaitDialog("Loading Solution...")) {
using (var progress = AsynchronousWaitDialog.ShowWaitDialog("${res:ICSharpCode.SharpDevelop.Gui.Dialogs.LoadingSolutionForm.Title}")) {

solution = LoadSolutionFile(fileName, progress);

Expand Down Expand Up @@ -226,7 +226,7 @@ void OpenProjectInternal(FileName fileName)
// Use try-finally block to dispose the solution unless it is opened successfully.
try {
if (SD.FileSystem.FileExists(solutionFile)) {
using (var progress = AsynchronousWaitDialog.ShowWaitDialog("Loading Solution...")) {
using (var progress = AsynchronousWaitDialog.ShowWaitDialog("${res:ICSharpCode.SharpDevelop.Gui.Dialogs.LoadingSolutionForm.Title}")) {
solution = LoadSolutionFile(solutionFile, progress);
}
// If LoadSolutionFile() throws ProjectLoadException, let that be handled by the ObservedLoad.
Expand Down
3 changes: 2 additions & 1 deletion src/Main/SharpDevelop/Project/SolutionLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,8 @@ public void ReadSolution(Solution solution, IProgressMonitor progress)
} else {
// Load project:
projectInfo.ActiveProjectConfiguration = projectInfo.ConfigurationMapping.GetProjectConfiguration(solution.ActiveConfiguration);
progress.TaskName = "Loading " + projectInfo.ProjectName;
var parseArgs = new[] { new StringTagPair("ProjectName", projectInfo.ProjectName) };
progress.TaskName = StringParser.Parse("${res:ICSharpCode.SharpDevelop.Gui.Dialogs.LoadingSolutionForm.LoadProject}", parseArgs);
using (projectInfo.ProgressMonitor = progress.CreateSubTask(1.0 / projectCount)) {
solutionItem = LoadProjectWithErrorHandling(projectInfo);
}
Expand Down