Fixes! And some changes to the translations.

NickeManarin · Dec 22, 2017 · 7a71084 · 7a71084
1 parent 92f860a
commit 7a71084
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 11 deletions.
diff --git a/ScreenToGif/Resources/Localization/StringResources.es-AR.xaml b/ScreenToGif/Resources/Localization/StringResources.es-AR.xaml
@@ -237,7 +237,7 @@
     <s:String x:Key="Encoder.ClearAllCompleted">Quitar lo completado</s:String>
     <s:String x:Key="Encoder.Starting">Iniciando…</s:String>
     <s:String x:Key="Encoder.Completed">Completado</s:String>
-    <s:String x:Key="Encoder.Completed.Clipboard">Completado&#x0d;Copiado al portapapales</s:String>
+    <s:String x:Key="Encoder.Completed.Clipboard">Copiado al portapapales</s:String>
     <s:String x:Key="Encoder.FileDeletedMoved">Archivo eliminado o movido</s:String>
     <s:String x:Key="Encoder.Canceled">Cancelado</s:String>
     <s:String x:Key="Encoder.Error">Error</s:String>

diff --git a/ScreenToGif/Resources/Localization/StringResources.es-ES.xaml b/ScreenToGif/Resources/Localization/StringResources.es-ES.xaml
@@ -301,7 +301,7 @@
     <s:String x:Key="Encoder.ClearAllCompleted">Limpiar todos los completados</s:String>
     <s:String x:Key="Encoder.Starting">Iniciando</s:String>
     <s:String x:Key="Encoder.Completed">Completado</s:String>
-    <s:String x:Key="Encoder.Completed.Clipboard">Completado&#x0d;Copiado en el Portapapeles</s:String>
+    <s:String x:Key="Encoder.Completed.Clipboard">Copiado en el Portapapeles</s:String>
     <s:String x:Key="Encoder.FileDeletedMoved">Archivo Borrado o Movido</s:String>
     <s:String x:Key="Encoder.Canceled">Cancelado</s:String>
     <s:String x:Key="Encoder.Error">Error</s:String>

diff --git a/ScreenToGif/Resources/Localization/StringResources.it.xaml b/ScreenToGif/Resources/Localization/StringResources.it.xaml
@@ -289,7 +289,7 @@
     <s:String x:Key="Encoder.ClearAllCompleted">Svuota tutti i completati</s:String>
     <s:String x:Key="Encoder.Starting">Inizio</s:String>
     <s:String x:Key="Encoder.Completed">Completato</s:String>
-    <s:String x:Key="Encoder.Completed.Clipboard">Completato&#x0a;copiato negli appunti</s:String>
+    <s:String x:Key="Encoder.Completed.Clipboard">copiato negli appunti</s:String>
     <s:String x:Key="Encoder.FileDeletedMoved">File eliminato o spostato</s:String>
     <s:String x:Key="Encoder.Canceled">Annullato</s:String>
     <s:String x:Key="Encoder.Error">Errore</s:String>

diff --git a/ScreenToGif/Resources/Localization/StringResources.nl.xaml b/ScreenToGif/Resources/Localization/StringResources.nl.xaml
@@ -301,7 +301,7 @@
     <s:String x:Key="Encoder.ClearAllCompleted">Weghalen alle voltooide</s:String>
     <s:String x:Key="Encoder.Starting">Opstarten</s:String>
     <s:String x:Key="Encoder.Completed">Voltooid</s:String>
-    <s:String x:Key="Encoder.Completed.Clipboard">Voltooid&#10;Gekopieerd naar klembord</s:String>
+    <s:String x:Key="Encoder.Completed.Clipboard">Gekopieerd naar klembord</s:String>
     <s:String x:Key="Encoder.FileDeletedMoved">Bestand verwijderd of verplaatst</s:String>
     <s:String x:Key="Encoder.Canceled">Geannuleerd</s:String>
     <s:String x:Key="Encoder.Error">Fout</s:String>

diff --git a/ScreenToGif/Resources/Localization/StringResources.pl.xaml b/ScreenToGif/Resources/Localization/StringResources.pl.xaml
@@ -279,7 +279,7 @@
     <s:String x:Key="Encoder.ClearAllCompleted">Wyczyść wszystkie zakończone.</s:String>
     <s:String x:Key="Encoder.Starting">Startowanie</s:String>
     <s:String x:Key="Encoder.Completed">Zakończone</s:String>
-    <s:String x:Key="Encoder.Completed.Clipboard">Ukończono&#x0d;Skopiowano do schowka</s:String>
+    <s:String x:Key="Encoder.Completed.Clipboard">Skopiowano do schowka</s:String>
     <s:String x:Key="Encoder.FileDeletedMoved">Plik usunięty lub przeniesiony</s:String>
     <s:String x:Key="Encoder.Canceled">Anulowano</s:String>
     <s:String x:Key="Encoder.Error">Błąd</s:String>

diff --git a/ScreenToGif/Resources/Localization/StringResources.pt-BR.xaml b/ScreenToGif/Resources/Localization/StringResources.pt-BR.xaml
@@ -309,7 +309,7 @@
     <s:String x:Key="Encoder.ClearAllCompleted">Remover Todos os Completos</s:String>
     <s:String x:Key="Encoder.Starting">Iniciando</s:String>
     <s:String x:Key="Encoder.Completed">Finalizado</s:String>
-    <s:String x:Key="Encoder.Completed.Clipboard">Finalizado&#x0d;Copiado para Área de Transferência</s:String>
+    <s:String x:Key="Encoder.Completed.Clipboard">Copiado</s:String>
     <s:String x:Key="Encoder.Completed.Clipboard.Fail">Falha ao copiar</s:String>
     <s:String x:Key="Encoder.Completed.Command">Comando executado</s:String>
     <s:String x:Key="Encoder.Completed.Command.Output">Exibe a resposta dos comando(s).</s:String>

diff --git a/ScreenToGif/Resources/Localization/StringResources.ru.xaml b/ScreenToGif/Resources/Localization/StringResources.ru.xaml
@@ -301,7 +301,7 @@
     <s:String x:Key="Encoder.ClearAllCompleted">Очистка завершена</s:String>
     <s:String x:Key="Encoder.Starting">Запуск</s:String>
     <s:String x:Key="Encoder.Completed">Готово</s:String>
-    <s:String x:Key="Encoder.Completed.Clipboard">Готово.&#10;Скопировано в буфер обмена.</s:String>
+    <s:String x:Key="Encoder.Completed.Clipboard">Скопировано в буфер обмена.</s:String>
     <s:String x:Key="Encoder.FileDeletedMoved">Файл удален или перемещен</s:String>
     <s:String x:Key="Encoder.Canceled">Отменено</s:String>
     <s:String x:Key="Encoder.Error">Ошибка</s:String>

diff --git a/ScreenToGif/Resources/Localization/StringResources.tr.xaml b/ScreenToGif/Resources/Localization/StringResources.tr.xaml
@@ -237,7 +237,7 @@
     <s:String x:Key="Encoder.ClearAllCompleted">Tümünü Temizleme Tamamlandı</s:String>
     <s:String x:Key="Encoder.Starting">Başlıyor</s:String>
     <s:String x:Key="Encoder.Completed">Tamamlandı</s:String>
-    <s:String x:Key="Encoder.Completed.Clipboard">Tamamlandı&#x0d;Panoya Kopyalandı</s:String>
+    <s:String x:Key="Encoder.Completed.Clipboard">Panoya Kopyalandı</s:String>
     <s:String x:Key="Encoder.FileDeletedMoved">Dosya Silinmiş veya Taşınmış</s:String>
     <s:String x:Key="Encoder.Canceled">İptal edildi</s:String>
     <s:String x:Key="Encoder.Error">Hata</s:String>

diff --git a/ScreenToGif/Resources/Localization/StringResources.zh-CN.xaml b/ScreenToGif/Resources/Localization/StringResources.zh-CN.xaml
@@ -304,7 +304,7 @@
     <s:String x:Key="Encoder.ClearAllCompleted">清除所有已完成条目</s:String>
     <s:String x:Key="Encoder.Starting">开始</s:String>
     <s:String x:Key="Encoder.Completed">已完成</s:String>
-    <s:String x:Key="Encoder.Completed.Clipboard">已完成&#10;已复制到剪贴板</s:String>
+    <s:String x:Key="Encoder.Completed.Clipboard">已复制到剪贴板</s:String>
     <s:String x:Key="Encoder.FileDeletedMoved">已删除或移动文件</s:String>
     <s:String x:Key="Encoder.Canceled">已取消</s:String>
     <s:String x:Key="Encoder.Error">错误</s:String>

diff --git a/ScreenToGif/Resources/Localization/StringResources.zh-TW.xaml b/ScreenToGif/Resources/Localization/StringResources.zh-TW.xaml
@@ -245,7 +245,7 @@
     <s:String x:Key="Encoder.ClearAllCompleted">清除所有已完成</s:String>
     <s:String x:Key="Encoder.Starting">正在開始</s:String>
     <s:String x:Key="Encoder.Completed">已完成</s:String>
-    <s:String x:Key="Encoder.Completed.Clipboard">已完成&#x0d;已複製到剪貼簿</s:String>
+    <s:String x:Key="Encoder.Completed.Clipboard">已複製到剪貼簿</s:String>
     <s:String x:Key="Encoder.FileDeletedMoved">檔案已刪除或已移動</s:String>
     <s:String x:Key="Encoder.Canceled">已取消</s:String>
     <s:String x:Key="Encoder.Error">錯誤</s:String>

diff --git a/ScreenToGif/Windows/Other/Encoder.xaml.cs b/ScreenToGif/Windows/Other/Encoder.xaml.cs
@@ -329,6 +329,21 @@ private void InternalSetUpload(int id, bool uploaded, string link, string delete
             });
         }
 
+        private string InternalGetUpload(int id)
+        {
+            return Dispatcher.Invoke(() =>
+            {
+                CommandManager.InvalidateRequerySuggested();
+
+                var item = EncodingListView.Items.Cast<EncoderListViewItem>().FirstOrDefault(x => x.Id == id);
+
+                if (item == null)
+                    return "";
+
+                return item.UploadLink;
+            });
+        }
+
         private void InternalSetCopy(int id, bool copied, Exception exception = null)
         {
             Dispatcher.Invoke(() =>
@@ -983,7 +998,9 @@ private void Encode(List<FrameInfo> listFrames, int id, Parameters param, Cancel
                                     data.SetText(Path.GetDirectoryName(param.Filename) ?? param.Filename, TextDataFormat.Text);
                                     break;
                                 case CopyType.Link:
-                                    data.SetText(param.Filename, TextDataFormat.Text); //TODO: Link.
+                                    var link = InternalGetUpload(id);
+
+                                    data.SetText(string.IsNullOrEmpty(link) ? param.Filename : link, TextDataFormat.Text);
                                     break;
                                 default:
                                     data.SetText(param.Filename, TextDataFormat.Text);