mirror of
https://github.com/greenshot/greenshot
synced 2025-08-21 05:53:27 -07:00
Code quality changes
This commit is contained in:
parent
f07ed83722
commit
610f45d082
189 changed files with 4609 additions and 5203 deletions
|
@ -26,7 +26,7 @@ namespace TranslationByMarkupExtension
|
|||
manager.LanguageChanged += OnLanguageChanged;
|
||||
}
|
||||
|
||||
protected override void StopListening(Object source)
|
||||
protected override void StopListening(object source)
|
||||
{
|
||||
var manager = (TranslationManager)source;
|
||||
manager.LanguageChanged -= OnLanguageChanged;
|
||||
|
|
|
@ -1,38 +1,30 @@
|
|||
using GreenshotPlugin.Core;
|
||||
|
||||
namespace TranslationByMarkupExtension {
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public class LanguageXMLTranslationProvider : ITranslationProvider {
|
||||
#region Private Members
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public class LanguageXMLTranslationProvider : ITranslationProvider {
|
||||
#region Private Members
|
||||
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
#region Construction
|
||||
#region Construction
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="ResxTranslationProvider"/> class.
|
||||
/// </summary>
|
||||
/// <param name="baseName">Name of the base.</param>
|
||||
/// <param name="assembly">The assembly.</param>
|
||||
public LanguageXMLTranslationProvider() {
|
||||
}
|
||||
#endregion
|
||||
|
||||
#endregion
|
||||
#region ITranslationProvider Members
|
||||
|
||||
#region ITranslationProvider Members
|
||||
|
||||
/// <summary>
|
||||
/// See <see cref="ITranslationProvider.Translate" />
|
||||
/// </summary>
|
||||
public object Translate(string key) {
|
||||
if (Language.hasKey("confluence", key)) {
|
||||
/// <summary>
|
||||
/// See <see cref="ITranslationProvider.Translate" />
|
||||
/// </summary>
|
||||
public object Translate(string key) {
|
||||
if (Language.HasKey("confluence", key)) {
|
||||
return Language.GetString("confluence", key);
|
||||
}
|
||||
return key;
|
||||
}
|
||||
}
|
||||
return key;
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,62 +3,55 @@ using System.ComponentModel;
|
|||
using System.Windows;
|
||||
|
||||
namespace TranslationByMarkupExtension {
|
||||
public class TranslationData : IWeakEventListener, INotifyPropertyChanged {
|
||||
#region Private Members
|
||||
public class TranslationData : IWeakEventListener, INotifyPropertyChanged {
|
||||
#region Private Members
|
||||
|
||||
private readonly string _key;
|
||||
private readonly string _key;
|
||||
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="TranslationData"/> class.
|
||||
/// </summary>
|
||||
/// <param name="key">The key.</param>
|
||||
public TranslationData( string key) {
|
||||
_key = key;
|
||||
LanguageChangedEventManager.AddListener(TranslationManager.Instance, this);
|
||||
}
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="TranslationData"/> class.
|
||||
/// </summary>
|
||||
/// <param name="key">The key.</param>
|
||||
public TranslationData( string key) {
|
||||
_key = key;
|
||||
LanguageChangedEventManager.AddListener(TranslationManager.Instance, this);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Releases unmanaged resources and performs other cleanup operations before the
|
||||
/// <see cref="TranslationData"/> is reclaimed by garbage collection.
|
||||
/// </summary>
|
||||
~TranslationData() {
|
||||
LanguageChangedEventManager.RemoveListener(TranslationManager.Instance, this);
|
||||
}
|
||||
/// <summary>
|
||||
/// Releases unmanaged resources and performs other cleanup operations before the
|
||||
/// <see cref="TranslationData"/> is reclaimed by garbage collection.
|
||||
/// </summary>
|
||||
~TranslationData() {
|
||||
LanguageChangedEventManager.RemoveListener(TranslationManager.Instance, this);
|
||||
}
|
||||
|
||||
public object Value {
|
||||
get {
|
||||
return TranslationManager.Instance.Translate(_key);
|
||||
}
|
||||
}
|
||||
public object Value => TranslationManager.Instance.Translate(_key);
|
||||
|
||||
#region IWeakEventListener Members
|
||||
#region IWeakEventListener Members
|
||||
|
||||
public bool ReceiveWeakEvent(Type managerType, object sender, EventArgs e)
|
||||
{
|
||||
if (managerType == typeof(LanguageChangedEventManager))
|
||||
{
|
||||
OnLanguageChanged(sender, e);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
public bool ReceiveWeakEvent(Type managerType, object sender, EventArgs e)
|
||||
{
|
||||
if (managerType == typeof(LanguageChangedEventManager))
|
||||
{
|
||||
OnLanguageChanged(sender, e);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private void OnLanguageChanged(object sender, EventArgs e)
|
||||
{
|
||||
if( PropertyChanged != null )
|
||||
{
|
||||
PropertyChanged( this, new PropertyChangedEventArgs("Value"));
|
||||
}
|
||||
}
|
||||
private void OnLanguageChanged(object sender, EventArgs e)
|
||||
{
|
||||
PropertyChanged?.Invoke( this, new PropertyChangedEventArgs("Value"));
|
||||
}
|
||||
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
#region INotifyPropertyChanged Members
|
||||
#region INotifyPropertyChanged Members
|
||||
|
||||
public event PropertyChangedEventHandler PropertyChanged;
|
||||
public event PropertyChangedEventHandler PropertyChanged;
|
||||
|
||||
#endregion
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,55 +1,45 @@
|
|||
using System;
|
||||
|
||||
namespace TranslationByMarkupExtension {
|
||||
public class TranslationManager {
|
||||
private static TranslationManager _translationManager;
|
||||
public class TranslationManager {
|
||||
private static TranslationManager _translationManager;
|
||||
|
||||
public event EventHandler LanguageChanged;
|
||||
public event EventHandler LanguageChanged;
|
||||
|
||||
/*public CultureInfo CurrentLanguage {
|
||||
get { return Thread.CurrentThread.CurrentUICulture; }
|
||||
set {
|
||||
if( value != Thread.CurrentThread.CurrentUICulture) {
|
||||
Thread.CurrentThread.CurrentUICulture = value;
|
||||
OnLanguageChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public IEnumerable<CultureInfo> Languages {
|
||||
get {
|
||||
if( TranslationProvider != null) {
|
||||
return TranslationProvider.Languages;
|
||||
}
|
||||
return Enumerable.Empty<CultureInfo>();
|
||||
}
|
||||
}*/
|
||||
|
||||
public static TranslationManager Instance {
|
||||
get {
|
||||
if (_translationManager == null) {
|
||||
_translationManager = new TranslationManager();
|
||||
/*public CultureInfo CurrentLanguage {
|
||||
get { return Thread.CurrentThread.CurrentUICulture; }
|
||||
set {
|
||||
if( value != Thread.CurrentThread.CurrentUICulture) {
|
||||
Thread.CurrentThread.CurrentUICulture = value;
|
||||
OnLanguageChanged();
|
||||
}
|
||||
return _translationManager;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public ITranslationProvider TranslationProvider { get; set; }
|
||||
public IEnumerable<CultureInfo> Languages {
|
||||
get {
|
||||
if( TranslationProvider != null) {
|
||||
return TranslationProvider.Languages;
|
||||
}
|
||||
return Enumerable.Empty<CultureInfo>();
|
||||
}
|
||||
}*/
|
||||
|
||||
private void OnLanguageChanged() {
|
||||
if (LanguageChanged != null) {
|
||||
LanguageChanged(this, EventArgs.Empty);
|
||||
}
|
||||
}
|
||||
public static TranslationManager Instance => _translationManager ?? (_translationManager = new TranslationManager());
|
||||
|
||||
public object Translate(string key) {
|
||||
if( TranslationProvider != null) {
|
||||
object translatedValue = TranslationProvider.Translate(key);
|
||||
if( translatedValue != null) {
|
||||
return translatedValue;
|
||||
}
|
||||
}
|
||||
return string.Format("!{0}!", key);
|
||||
}
|
||||
}
|
||||
public ITranslationProvider TranslationProvider { get; set; }
|
||||
|
||||
private void OnLanguageChanged()
|
||||
{
|
||||
LanguageChanged?.Invoke(this, EventArgs.Empty);
|
||||
}
|
||||
|
||||
public object Translate(string key) {
|
||||
object translatedValue = TranslationProvider?.Translate(key);
|
||||
if( translatedValue != null) {
|
||||
return translatedValue;
|
||||
}
|
||||
return $"!{key}!";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue