Fix issues identified by running TranslationApp

Author: RussKie

GitUI/CommandsDialogs/EnvironmentInfo.cs

@@ -8,7 +8,7 @@ public partial class EnvironmentInfo : UserControl
     {
         public EnvironmentInfo()
         {
-            if (LicenseManager.UsageMode == LicenseUsageMode.Designtime)
+            if (LicenseManager.UsageMode == LicenseUsageMode.Designtime || GitModuleForm.IsUnitTestActive)
             {
                 UserEnvironmentInformation.Initialise(
                 "9999999999999999999999999999999999abcdef", true);

GitUI/CommandsDialogs/FormAbout.Designer.cs

@@ -23,7 +23,7 @@ public FormAbout()
 
             // Click handlers
             _NO_TRANSLATE_labelProductName.LinkClicked += (s, e) => { Process.Start(@"http://github.com/gitextensions/gitextensions"); };
-            thanksTo.LinkClicked += delegate { ShowContributorsForm(); };
+            _NO_TRANSLATE_ThanksTo.LinkClicked += delegate { ShowContributorsForm(); };
             pictureDonate.Click += delegate { Process.Start(FormDonate.DonationUrl); };
             linkLabelIcons.LinkClicked += delegate { Process.Start("http://p.yusukekamiyamane.com/"); };
 
@@ -54,7 +54,7 @@ void ThankNextContributor()
                 // Select a contributor at random
                 var contributorName = contributorsList[random.Next(contributorsList.Count - 1)].Trim();
 
-                thanksTo.Text = thanksToContributorsText + contributorName;
+                _NO_TRANSLATE_ThanksTo.Text = thanksToContributorsText + contributorName;
             }
 
             IReadOnlyList<string> GetContributorList()

GitUI/CommandsDialogs/FormAbout.cs

@@ -136,9 +136,11 @@ protected override void Dispose(bool disposing)
             if (disposing)
             {
                 _asyncLoader.Dispose();
-                _filterRevisionsHelper.Dispose();
-                _filterBranchHelper.Dispose();
-                _formBrowseMenus.Dispose();
+
+                // if the form was instantiated by the translation app, all of the following would be null
+                _filterRevisionsHelper?.Dispose();
+                _filterBranchHelper?.Dispose();
+                _formBrowseMenus?.Dispose();
 
                 components?.Dispose();
             }

GitUI/CommandsDialogs/FormFileHistory.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using GitCommands;
@@ -14,6 +15,11 @@ public GeneralSettingsPage()
             Text = "General";
             InitializeComplete();
 
+            if (LicenseManager.UsageMode == LicenseUsageMode.Designtime || GitModuleForm.IsUnitTestActive)
+            {
+                return;
+            }
+
             ThreadHelper.JoinableTaskFactory.Run(async () =>
             {
                 var repositoryHistory = await RepositoryHistoryManager.Locals.LoadRecentHistoryAsync();

GitUI/CommandsDialogs/SettingsDialog/Pages/GeneralSettingsPage.cs

@@ -15,6 +15,9 @@ public class GitModuleForm : GitExtensionsForm, IGitUICommandsSource
         /// <inheritdoc />
         public event EventHandler<GitUICommandsChangedEventArgs> UICommandsChanged;
 
+        /// <summary>
+        /// Indicates that the process is run by unit tests runner.
+        /// </summary>
         internal static bool IsUnitTestActive { get; set; }
 
         [CanBeNull] private GitUICommands _uiCommands;

GitUI/GitModuleForm.cs

@@ -1,4 +1,5 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("GitUITests")]
+[assembly: InternalsVisibleTo("TranslationApp")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] // required for NSubstitute for mocking internal members

GitUI/Properties/AssemblyInfo.cs

@@ -1,3 +1,5 @@
+pushd $PSScriptRoot
+
 Write-Host "Copying the latest English translation before the update..."
 $translationsFolder = Resolve-Path .\
 $releaseTranslationsFolder = Resolve-Path ..\..\GitExtensions\bin\Release\Translation
@@ -8,6 +10,10 @@ $src = Resolve-Path ..\..\GitExtensions\bin\Release
 pushd "$src"
 Write-Host "Updating the English translation..."
 Start-Process -FilePath "$src\TranslationApp.exe" -ArgumentList "update" -Wait
+if ($LASTEXITCODE -ne 0) {
+    popd
+    exit -1
+}
 popd
 
 Write-Host "Copying the updated English translation to commit..."

GitUI/Translation/UpdateLocalEnglishTranslations.ps1

@@ -22,15 +22,15 @@ public partial class BitbucketPullRequestForm : GitExtensionsFormBase
         [CanBeNull] private readonly Settings _settings;
         private readonly BindingList<BitbucketUser> _reviewers = new BindingList<BitbucketUser>();
 
-        public BitbucketPullRequestForm(Settings settings)
+        public BitbucketPullRequestForm([CanBeNull] Settings settings)
         {
             InitializeComponent();
 
             // NOTE ddlBranchSource and ddlBranchTarget both have string items so do not need a display member
             ddlRepositorySource.DisplayMember = nameof(Repository.DisplayName);
             ddlRepositoryTarget.DisplayMember = nameof(Repository.DisplayName);
 
-            _settings = settings;
+            _settings = settings ?? new Settings();
 
             Load += delegate
             {

Plugins/Bitbucket/BitbucketPullRequestForm.cs

@@ -69,6 +69,11 @@ private static void UpdateAllTranslations()
         {
             using (new WaitCursorScope())
             {
+                // we will be instantiating a number of forms using their default .ctors
+                // this would lead to InvalidOperationException thrown in GitModuleForm()
+                // set the flag that will stop this from happening
+                GitModuleForm.IsUnitTestActive = true;
+
                 var neutralItems = TranslationHelpers.LoadNeutralItems();
                 string filename = Path.Combine(Translator.GetTranslationDir(), "English.xlf");
                 TranslationHelpers.SaveTranslation(null, neutralItems, filename);