diff --git a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj
index 6e9324567..1f6142625 100644
--- a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj
+++ b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj
@@ -201,6 +201,7 @@
+ ..\packages\Caliburn.Micro.3.2.0\lib\net45\System.Windows.Interactivity.dll
@@ -235,6 +236,7 @@
+
diff --git a/Source/ChocolateyGui.Common.Windows/Resources/Controls.xaml b/Source/ChocolateyGui.Common.Windows/Resources/Controls.xaml
index bce4eb819..d0a3a4456 100644
--- a/Source/ChocolateyGui.Common.Windows/Resources/Controls.xaml
+++ b/Source/ChocolateyGui.Common.Windows/Resources/Controls.xaml
@@ -338,6 +338,15 @@
+
+
+
+
+
+
+
+
+
+
-
+
@@ -49,48 +57,48 @@
-
-
-
@@ -108,10 +116,10 @@
-
@@ -132,9 +140,9 @@
-
@@ -149,8 +157,8 @@
-
@@ -160,43 +168,51 @@
-
-
-
+
+
-
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
@@ -204,21 +220,52 @@
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
@@ -235,10 +282,10 @@
-
+
-
+
@@ -249,34 +296,56 @@
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -285,25 +354,24 @@
-
-
-
-
\ No newline at end of file
diff --git a/Source/ChocolateyGui.Common.Windows/Views/AdvancedInstallView.xaml.cs b/Source/ChocolateyGui.Common.Windows/Views/AdvancedInstallView.xaml.cs
index 9be530d0b..ed217e7b3 100644
--- a/Source/ChocolateyGui.Common.Windows/Views/AdvancedInstallView.xaml.cs
+++ b/Source/ChocolateyGui.Common.Windows/Views/AdvancedInstallView.xaml.cs
@@ -5,6 +5,7 @@
//
// --------------------------------------------------------------------------------------------------------------------
+using System;
using System.Windows.Controls;
namespace ChocolateyGui.Common.Windows.Views
@@ -17,6 +18,10 @@ public partial class AdvancedInstallView : UserControl
public AdvancedInstallView()
{
InitializeComponent();
+
+ Is32BitPlatform = !Environment.Is64BitOperatingSystem;
}
+
+ public bool Is32BitPlatform { get; set; }
}
}
\ No newline at end of file
diff --git a/Source/ChocolateyGui.Common.Windows/Views/PackageView.xaml b/Source/ChocolateyGui.Common.Windows/Views/PackageView.xaml
index 69551e4b9..1c44b4786 100644
--- a/Source/ChocolateyGui.Common.Windows/Views/PackageView.xaml
+++ b/Source/ChocolateyGui.Common.Windows/Views/PackageView.xaml
@@ -70,9 +70,15 @@
diff --git a/Source/ChocolateyGui.Common.Windows/Views/SettingsView.xaml b/Source/ChocolateyGui.Common.Windows/Views/SettingsView.xaml
index 43cc82188..19f315f75 100644
--- a/Source/ChocolateyGui.Common.Windows/Views/SettingsView.xaml
+++ b/Source/ChocolateyGui.Common.Windows/Views/SettingsView.xaml
@@ -64,7 +64,8 @@
-
+
+
@@ -261,6 +262,8 @@
diff --git a/Source/ChocolateyGui.Common.Windows/Views/ShellView.xaml.cs b/Source/ChocolateyGui.Common.Windows/Views/ShellView.xaml.cs
index 1a9a4d0f8..5e3a0585a 100644
--- a/Source/ChocolateyGui.Common.Windows/Views/ShellView.xaml.cs
+++ b/Source/ChocolateyGui.Common.Windows/Views/ShellView.xaml.cs
@@ -8,9 +8,11 @@
using System;
using System.ComponentModel;
using System.Diagnostics;
+using System.Globalization;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Input;
+using System.Windows.Markup;
using System.Windows.Media.Imaging;
using Caliburn.Micro;
using chocolatey.infrastructure.filesystem;
@@ -67,6 +69,13 @@ public ShellView(
{
Environment.CurrentDirectory = Bootstrapper.ApplicationFilesPath;
}
+
+ dialogService.ChildWindowOpened += (sender, o) => IsAnyDialogOpen = true;
+ dialogService.ChildWindowClosed += (sender, o) => IsAnyDialogOpen = false;
+
+ SetLanguage(TranslationSource.Instance.CurrentCulture);
+
+ TranslationSource.Instance.PropertyChanged += TranslationLanguageChanged;
}
public void CheckOperatingSystemCompatibility()
@@ -154,5 +163,18 @@ private void PerformGoToPage(object sender, ExecutedRoutedEventArgs e)
Process.Start(new ProcessStartInfo(e.Parameter.ToString()));
e.Handled = true;
}
+
+ private void TranslationLanguageChanged(object sender, PropertyChangedEventArgs e)
+ {
+ SetLanguage(TranslationSource.Instance.CurrentCulture);
+ }
+
+ private void SetLanguage(CultureInfo culture)
+ {
+ Language = XmlLanguage.GetLanguage(culture.IetfLanguageTag);
+ FlowDirection = culture.TextInfo.IsRightToLeft
+ ? FlowDirection.RightToLeft
+ : FlowDirection.LeftToRight;
+ }
}
}
\ No newline at end of file
diff --git a/Source/ChocolateyGui.Common/Models/AdvancedInstall.cs b/Source/ChocolateyGui.Common/Models/AdvancedInstall.cs
index 1be344ef9..d01fd47ec 100644
--- a/Source/ChocolateyGui.Common/Models/AdvancedInstall.cs
+++ b/Source/ChocolateyGui.Common/Models/AdvancedInstall.cs
@@ -15,6 +15,8 @@ public class AdvancedInstall
public int ExecutionTimeoutInSeconds { get; set; }
+ public string CacheLocation { get; set; }
+
public string LogFile { get; set; }
public bool PreRelease { get; set; }
diff --git a/Source/ChocolateyGui.Common/Properties/Resources.Designer.cs b/Source/ChocolateyGui.Common/Properties/Resources.Designer.cs
index 953fc546a..00bd182d7 100644
--- a/Source/ChocolateyGui.Common/Properties/Resources.Designer.cs
+++ b/Source/ChocolateyGui.Common/Properties/Resources.Designer.cs
@@ -133,7 +133,7 @@ public static string AdvancedChocolateyDialog_AllowEmptyChecksums_Header {
}
///
- /// Looks up a localized string similar to Allow packages to have empty/missing checksums for downloaded resources from non-secure locations (HTTP, FTP). Use this switch is not recommended if using sources that download resources from the internet. Overrides the default feature 'allowEmptyChecksums' set to 'False'. Available in Chocolatey Version 0.10.0+..
+ /// Looks up a localized string similar to Allow packages to have empty/missing checksums for downloaded resources from non-secure locations (HTTP, FTP). Using this switch is not recommended if using sources that download resources from the internet. Only overrides the value in the configuration when 'On' is specified..
///
public static string AdvancedChocolateyDialog_AllowEmptyChecksums_ToolTip {
get {
@@ -151,7 +151,7 @@ public static string AdvancedChocolateyDialog_AllowEmptyChecksumsSecure_Header {
}
///
- /// Looks up a localized string similar to Allow packages to have empty checksums for downloaded resources from secure locations (HTTPS). Overrides the default feature 'allowEmptyChecksumsSecure' set to 'True'. Available in Chocolatey Version 0.10.0+..
+ /// Looks up a localized string similar to Allow packages to have empty checksums for downloaded resources from secure locations (HTTPS). Only overrides the value in the configuration when 'On' is specified..
///
public static string AdvancedChocolateyDialog_AllowEmptyChecksumsSecure_ToolTip {
get {
@@ -213,6 +213,15 @@ public static string AdvancedChocolateyDialog_ApplyPackageParametersToDependenci
}
}
+ ///
+ /// Looks up a localized string similar to Browse.
+ ///
+ public static string AdvancedChocolateyDialog_Browse {
+ get {
+ return ResourceManager.GetString("AdvancedChocolateyDialog_Browse", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Cancel.
///
@@ -231,6 +240,33 @@ public static string AdvancedChocolateyDialog_Buttons_Install {
}
}
+ ///
+ /// Looks up a localized string similar to The location to store any files downloaded by package during installations or upgrades..
+ ///
+ public static string AdvancedChocolateyDialog_CacheLocation_BrowseDescription {
+ get {
+ return ResourceManager.GetString("AdvancedChocolateyDialog_CacheLocation_BrowseDescription", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Cache Location.
+ ///
+ public static string AdvancedChocolateyDialog_CacheLocation_Header {
+ get {
+ return ResourceManager.GetString("AdvancedChocolateyDialog_CacheLocation_Header", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Location for download cache, defaults to %TEMP% or value in chocolatey.config file..
+ ///
+ public static string AdvancedChocolateyDialog_CacheLocation_ToolTip {
+ get {
+ return ResourceManager.GetString("AdvancedChocolateyDialog_CacheLocation_ToolTip", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Checksum Options.
///
@@ -259,7 +295,7 @@ public static string AdvancedChocolateyDialog_DownloadChecksum_Header {
}
///
- /// Looks up a localized string similar to A user provided checksum for downloaded resources for the package. Overrides the package checksum (if it has one). Defaults to empty. Available in Chocolatey Version 0.10.0+..
+ /// Looks up a localized string similar to A user provided checksum for downloaded resources for the package. Overrides the package checksum (if it has one)..
///
public static string AdvancedChocolateyDialog_DownloadChecksum_ToolTip {
get {
@@ -277,7 +313,7 @@ public static string AdvancedChocolateyDialog_DownloadChecksum64bit_Header {
}
///
- /// Looks up a localized string similar to A user provided checksum for 64bit downloaded resources for the package. Overrides the package 64-bit checksum (if it has one). Defaults to same as Download Checksum. Available in Chocolatey Version 0.10.0+..
+ /// Looks up a localized string similar to A user provided checksum for 64bit downloaded resources for the package. Overrides the package 64-bit checksum (if it has one)..
///
public static string AdvancedChocolateyDialog_DownloadChecksum64bit_ToolTip {
get {
@@ -295,7 +331,7 @@ public static string AdvancedChocolateyDialog_DownloadChecksumType_Header {
}
///
- /// Looks up a localized string similar to A user provided checksum type. Overrides the package checksum type (if it has one). Used in conjunction with Download Checksum. Available values are 'md5', 'sha1', 'sha256' or 'sha512'. Defaults to 'md5'. Available in Chocolatey Version 0.10.0+..
+ /// Looks up a localized string similar to A user provided checksum type. Overrides the package checksum type (if it has one). Used in conjunction with Download Checksum..
///
public static string AdvancedChocolateyDialog_DownloadChecksumType_ToolTip {
get {
@@ -313,7 +349,7 @@ public static string AdvancedChocolateyDialog_DownloadChecksumType64bit_Header {
}
///
- /// Looks up a localized string similar to A user provided checksum for 64bit downloaded resources for the package. Overrides the package 64-bit checksum (if it has one). Used in conjunction with Download Checksum 64bit. Available values are 'md5', 'sha1', 'sha256' or 'sha512'. Defaults to same as Download Checksum Type. Available in Chocolatey Version 0.10.0+..
+ /// Looks up a localized string similar to A user provided checksum for 64bit downloaded resources for the package. Overrides the package 64-bit checksum (if it has one)..
///
public static string AdvancedChocolateyDialog_DownloadChecksumType64bit_ToolTip {
get {
@@ -331,7 +367,7 @@ public static string AdvancedChocolateyDialog_ExecutionTimeoutInSeconds_Header {
}
///
- /// Looks up a localized string similar to The time to allow a command to finish before timing out. Overrides the default execution timeout in the configuration of 2700 seconds. '0' for infinite starting in Chocolatey Version 0.10.4..
+ /// Looks up a localized string similar to The time to allow a command to finish before timing out. Overrides the default execution timeout in the configuration. '0' for infinite starting in Chocolatey Version 0.10.4..
///
public static string AdvancedChocolateyDialog_ExecutionTimeoutInSeconds_ToolTip {
get {
@@ -385,7 +421,7 @@ public static string AdvancedChocolateyDialog_IgnoreChecksums_Header {
}
///
- /// Looks up a localized string similar to Ignore checksums provided by the package. Overrides the default feature 'checksumFiles' set to 'True'. Available in Chocolatey Version 0.9.9.9+..
+ /// Looks up a localized string similar to Ignore checksums provided by the package. Overrides the default feature 'checksumFiles' if it is set to 'True'. Only overrides the value in the configuration when 'On' is specified..
///
public static string AdvancedChocolateyDialog_IgnoreChecksums_ToolTip {
get {
@@ -447,6 +483,15 @@ public static string AdvancedChocolateyDialog_InstallArguments_ToolTip {
}
}
+ ///
+ /// Looks up a localized string similar to Latest Version.
+ ///
+ public static string AdvancedChocolateyDialog_LatestVersion {
+ get {
+ return ResourceManager.GetString("AdvancedChocolateyDialog_LatestVersion", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Log File.
///
@@ -457,7 +502,7 @@ public static string AdvancedChocolateyDialog_LogFile_Header {
}
///
- /// Looks up a localized string similar to File to output to in addition to regular loggers. Available in Chocolatey Version 0.10.8+..
+ /// Looks up a localized string similar to File to output to in addition to regular loggers..
///
public static string AdvancedChocolateyDialog_LogFile_ToolTip {
get {
@@ -565,7 +610,7 @@ public static string AdvancedChocolateyDialog_RequireChecksums_Header {
}
///
- /// Looks up a localized string similar to Requires packages to have checksums for downloaded resources (both non-secure and secure). Overrides the default feature 'allowEmptyChecksums' set to 'False' and 'allowEmptyChecksumsSecure' set to 'True'. Available in Chocolatey Version 0.10.0+..
+ /// Looks up a localized string similar to Requires packages to have checksums for downloaded resources (both non-secure and secure)..
///
public static string AdvancedChocolateyDialog_RequireChecksums_ToolTip {
get {
@@ -1676,6 +1721,33 @@ public static string FeatureCommand_UnknownCommandError {
}
}
+ ///
+ /// Looks up a localized string similar to All Files.
+ ///
+ public static string FilePicker_AllFiles {
+ get {
+ return ResourceManager.GetString("FilePicker_AllFiles", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Log Files.
+ ///
+ public static string FilePicker_LogFiles {
+ get {
+ return ResourceManager.GetString("FilePicker_LogFiles", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Text Files.
+ ///
+ public static string FilePicker_TextFiles {
+ get {
+ return ResourceManager.GetString("FilePicker_TextFiles", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to You may not have the appropriate permissions to perform this action..
///
diff --git a/Source/ChocolateyGui.Common/Properties/Resources.resx b/Source/ChocolateyGui.Common/Properties/Resources.resx
index dcc5595df..4fdd003e8 100644
--- a/Source/ChocolateyGui.Common/Properties/Resources.resx
+++ b/Source/ChocolateyGui.Common/Properties/Resources.resx
@@ -432,6 +432,9 @@ NOTE: Probably only necessary to change in RTL languages.
A-Z
+ The letter 'A' should be translated to the first letter in your language,
+and the letter 'Z' to the last letter in your alphabet.
+Or if there is a traditional way to show sorting by the Title in your language, that should be used instead.Popularity
@@ -1056,13 +1059,13 @@ Please contact your System Administrator to enable this operation.
Allow Empty Checksums Secure
- Allow packages to have empty checksums for downloaded resources from secure locations (HTTPS). Overrides the default feature 'allowEmptyChecksumsSecure' set to 'True'. Available in Chocolatey Version 0.10.0+.
+ Allow packages to have empty checksums for downloaded resources from secure locations (HTTPS). Only overrides the value in the configuration when 'On' is specified.Allow Empty Checksums
- Allow packages to have empty/missing checksums for downloaded resources from non-secure locations (HTTP, FTP). Use this switch is not recommended if using sources that download resources from the internet. Overrides the default feature 'allowEmptyChecksums' set to 'False'. Available in Chocolatey Version 0.10.0+.
+ Allow packages to have empty/missing checksums for downloaded resources from non-secure locations (HTTP, FTP). Using this switch is not recommended if using sources that download resources from the internet. Only overrides the value in the configuration when 'On' is specified.Allow Multiple Versions
@@ -1098,31 +1101,31 @@ Please contact your System Administrator to enable this operation.
Download Checksum 64bit
- A user provided checksum for 64bit downloaded resources for the package. Overrides the package 64-bit checksum (if it has one). Defaults to same as Download Checksum. Available in Chocolatey Version 0.10.0+.
+ A user provided checksum for 64bit downloaded resources for the package. Overrides the package 64-bit checksum (if it has one).Download Checksum Type 64bit
- A user provided checksum for 64bit downloaded resources for the package. Overrides the package 64-bit checksum (if it has one). Used in conjunction with Download Checksum 64bit. Available values are 'md5', 'sha1', 'sha256' or 'sha512'. Defaults to same as Download Checksum Type. Available in Chocolatey Version 0.10.0+.
+ A user provided checksum for 64bit downloaded resources for the package. Overrides the package 64-bit checksum (if it has one).Download Checksum Type
- A user provided checksum type. Overrides the package checksum type (if it has one). Used in conjunction with Download Checksum. Available values are 'md5', 'sha1', 'sha256' or 'sha512'. Defaults to 'md5'. Available in Chocolatey Version 0.10.0+.
+ A user provided checksum type. Overrides the package checksum type (if it has one). Used in conjunction with Download Checksum.Download Checksum
- A user provided checksum for downloaded resources for the package. Overrides the package checksum (if it has one). Defaults to empty. Available in Chocolatey Version 0.10.0+.
+ A user provided checksum for downloaded resources for the package. Overrides the package checksum (if it has one).Execution Timeout In Seconds
- The time to allow a command to finish before timing out. Overrides the default execution timeout in the configuration of 2700 seconds. '0' for infinite starting in Chocolatey Version 0.10.4.
+ The time to allow a command to finish before timing out. Overrides the default execution timeout in the configuration. '0' for infinite starting in Chocolatey Version 0.10.4.Force Dependencies
@@ -1140,7 +1143,7 @@ Please contact your System Administrator to enable this operation.
Ignore Checksums
- Ignore checksums provided by the package. Overrides the default feature 'checksumFiles' set to 'True'. Available in Chocolatey Version 0.9.9.9+.
+ Ignore checksums provided by the package. Overrides the default feature 'checksumFiles' if it is set to 'True'. Only overrides the value in the configuration when 'On' is specified.Ignore Dependencies
@@ -1158,7 +1161,7 @@ Please contact your System Administrator to enable this operation.
Log File
- File to output to in addition to regular loggers. Available in Chocolatey Version 0.10.8+.
+ File to output to in addition to regular loggers.Not Silent
@@ -1194,7 +1197,7 @@ Please contact your System Administrator to enable this operation.
Require Checksums
- Requires packages to have checksums for downloaded resources (both non-secure and secure). Overrides the default feature 'allowEmptyChecksums' set to 'False' and 'allowEmptyChecksumsSecure' set to 'True'. Available in Chocolatey Version 0.10.0+.
+ Requires packages to have checksums for downloaded resources (both non-secure and secure).Skip PowerShell
@@ -1355,4 +1358,29 @@ Please contact your System Administrator to enable this operation.
The preferred language for Chocolatey GUI. Defaults to Windows System Locale.
+
+ Log Files
+
+
+ All Files
+
+
+ Text Files
+
+
+ Latest Version
+
+
+ Cache Location
+
+
+ Location for download cache, defaults to %TEMP% or value in chocolatey.config file.
+
+
+ The location to store any files downloaded by package during installations or upgrades.
+
+
+ Browse
+ This text is used for both when a user clicks a button supposed to select a file, and when selecting a folder.
+
\ No newline at end of file
diff --git a/Source/ChocolateyGui.Common/Services/IPersistenceService.cs b/Source/ChocolateyGui.Common/Services/IPersistenceService.cs
index 0971a295a..102f62a7a 100644
--- a/Source/ChocolateyGui.Common/Services/IPersistenceService.cs
+++ b/Source/ChocolateyGui.Common/Services/IPersistenceService.cs
@@ -15,6 +15,8 @@ public interface IPersistenceService
Stream SaveFile(string defaultExtension, string filter);
+ string GetFolderPath(string defaultLocation, string description = null);
+
string GetFilePath(string defaultExtension, string filter);
}
}
\ No newline at end of file
diff --git a/Source/ChocolateyGui.Common/Utilities/TranslationSource.cs b/Source/ChocolateyGui.Common/Utilities/TranslationSource.cs
index 57bf12ddf..f95a01005 100644
--- a/Source/ChocolateyGui.Common/Utilities/TranslationSource.cs
+++ b/Source/ChocolateyGui.Common/Utilities/TranslationSource.cs
@@ -10,7 +10,6 @@
using System.Globalization;
using System.Resources;
using System.Runtime.CompilerServices;
-using chocolatey;
using ChocolateyGui.Common.Properties;
namespace ChocolateyGui.Common.Utilities
@@ -67,7 +66,7 @@ public string this[string key]
if (parameters != null && parameters.Length > 0)
{
- return value.format_with(parameters);
+ return string.Format(CurrentCulture, value, parameters);
}
return value;
diff --git a/Source/ChocolateyGui.Common/ViewModels/Items/IPackageViewModel.cs b/Source/ChocolateyGui.Common/ViewModels/Items/IPackageViewModel.cs
index ffb418f54..aefd1e9cd 100644
--- a/Source/ChocolateyGui.Common/ViewModels/Items/IPackageViewModel.cs
+++ b/Source/ChocolateyGui.Common/ViewModels/Items/IPackageViewModel.cs
@@ -81,7 +81,7 @@ public interface IPackageViewModel
Task Install();
- void InstallAdvanced();
+ Task InstallAdvanced();
Task Uninstall();