diff --git a/OneMore/Commands/File/ImportCommand.cs b/OneMore/Commands/File/ImportCommand.cs index b36b48a1fb..600e9ae4fa 100644 --- a/OneMore/Commands/File/ImportCommand.cs +++ b/OneMore/Commands/File/ImportCommand.cs @@ -18,7 +18,6 @@ namespace River.OneMoreAddIn.Commands using Windows.Data.Pdf; using Windows.Storage; using Windows.Storage.Streams; - using Resx = Properties.Resources; /// @@ -509,12 +508,6 @@ private async Task ImportPdfFile(string filepath, bool append, CancellationToken private async Task ImportMarkdown(string filepath) { - if (filepath.IndexOf(' ') >= 0) - { - ShowInfo(string.Format(Resx.ImportCommand_noSpaces, filepath)); - return; - } - logger.StartClock(); if (!PathHelper.HasWildFileName(filepath)) diff --git a/OneMore/Commands/File/Markdown/WikilinkRenderer.cs b/OneMore/Commands/File/Markdown/WikilinkRenderer.cs index 2304843c78..8202494706 100644 --- a/OneMore/Commands/File/Markdown/WikilinkRenderer.cs +++ b/OneMore/Commands/File/Markdown/WikilinkRenderer.cs @@ -37,7 +37,10 @@ protected override void Write(HtmlRenderer renderer, WikilinkInline obj) // : link; var uri = new Uri(Path.Combine(renderer.BaseUrl.AbsolutePath, filename)); - var src = uri.AbsoluteUri; + + var src = uri.AbsoluteUri + // double-encoding might encode "%20" to "%2520" (%25 is "%") + .Replace("%2520", "%20"); renderer.Write($"\"{label}\""); Logger.Current.WriteLine($"wrender src=[{src}] alt=[{label}]"); diff --git a/OneMore/Properties/Resources.Designer.cs b/OneMore/Properties/Resources.Designer.cs index 1a086f9312..c2f52991be 100644 --- a/OneMore/Properties/Resources.Designer.cs +++ b/OneMore/Properties/Resources.Designer.cs @@ -3974,16 +3974,6 @@ internal static string ImagesSheet_widthLabel_Text { } } - /// - /// Looks up a localized string similar to OneNote cannot import markdown files from paths containing spaces: - ///{0}. - /// - internal static string ImportCommand_noSpaces { - get { - return ResourceManager.GetString("ImportCommand_noSpaces", resourceCulture); - } - } - /// /// Looks up a localized string similar to File:. /// diff --git a/OneMore/Properties/Resources.ar-SA.resx b/OneMore/Properties/Resources.ar-SA.resx index 9edc512492..3ad4d0e2d9 100644 --- a/OneMore/Properties/Resources.ar-SA.resx +++ b/OneMore/Properties/Resources.ar-SA.resx @@ -1534,11 +1534,6 @@ عرض تغيير الحجم المفضل label - - لا يمكن لـ OneNote استيراد ملفات تخفيض السعر من المسارات التي تحتوي على مسافات: -{0} - error message - ملف: label diff --git a/OneMore/Properties/Resources.de-DE.resx b/OneMore/Properties/Resources.de-DE.resx index bdb21630fb..7d178eeee2 100644 --- a/OneMore/Properties/Resources.de-DE.resx +++ b/OneMore/Properties/Resources.de-DE.resx @@ -1534,11 +1534,6 @@ Gelber Hintergrund Bevorzugte Größenänderungsbreite label - - OneNote kann keine Markdown-Dateien aus Pfaden importieren, die Leerzeichen enthalten: -{0} - error message - Datei: label diff --git a/OneMore/Properties/Resources.es-ES.resx b/OneMore/Properties/Resources.es-ES.resx index 66fd231b68..0bad79e320 100644 --- a/OneMore/Properties/Resources.es-ES.resx +++ b/OneMore/Properties/Resources.es-ES.resx @@ -1534,11 +1534,6 @@ Fondo amarillo Ancho de cambio de tamaño preferido label - - OneNote no puede importar archivos de rebajas desde rutas que contengan espacios: -{0} - error message - Archivo: label diff --git a/OneMore/Properties/Resources.fr-FR.resx b/OneMore/Properties/Resources.fr-FR.resx index 78aa7db655..ca0ca9b433 100644 --- a/OneMore/Properties/Resources.fr-FR.resx +++ b/OneMore/Properties/Resources.fr-FR.resx @@ -1534,11 +1534,6 @@ Fond jaune Largeur de redimensionnement préférée label - - OneNote ne peut pas importer de fichiers démarques à partir de chemins contenant des espaces : -{0} - error message - Fichier: label diff --git a/OneMore/Properties/Resources.he-IL.resx b/OneMore/Properties/Resources.he-IL.resx index b8b0050957..0ad639f712 100644 --- a/OneMore/Properties/Resources.he-IL.resx +++ b/OneMore/Properties/Resources.he-IL.resx @@ -1535,11 +1535,6 @@ Total Row Font שינוי גודל רוחב מועדף label - - ל-OneNote אין אפשרות לייבא קבצי סימון מנתיבים המכילים רווחים: -{0} - error message - קוֹבֶץ: label diff --git a/OneMore/Properties/Resources.ja-JP.resx b/OneMore/Properties/Resources.ja-JP.resx index 442946f3bc..ff8c16f470 100644 --- a/OneMore/Properties/Resources.ja-JP.resx +++ b/OneMore/Properties/Resources.ja-JP.resx @@ -1537,11 +1537,6 @@ OneNoteファイル (*.one) 標準サイズ幅 label - - OneNote は、スペースを含むパスからマークダウン ファイルをインポートできません。 -{0} - error message - ファイル: label diff --git a/OneMore/Properties/Resources.nl-NL.resx b/OneMore/Properties/Resources.nl-NL.resx index 6f39a11fbd..e8a7e7a92c 100644 --- a/OneMore/Properties/Resources.nl-NL.resx +++ b/OneMore/Properties/Resources.nl-NL.resx @@ -1535,11 +1535,6 @@ Gele achtergrond Voorkeur formaat wijzigen breedte label - - OneNote kan geen markdown-bestanden importeren uit paden die spaties bevatten: -{0} - error message - Het dossier: label diff --git a/OneMore/Properties/Resources.pl-PL.resx b/OneMore/Properties/Resources.pl-PL.resx index 07630ccff4..408ff556d5 100644 --- a/OneMore/Properties/Resources.pl-PL.resx +++ b/OneMore/Properties/Resources.pl-PL.resx @@ -1535,11 +1535,6 @@ Czerwony pierwszy plan Preferowana szerokość zmiany rozmiaru label - - Program OneNote nie może importować plików przecen ze ścieżek zawierających spacje: -{0} - error message - Plik: label diff --git a/OneMore/Properties/Resources.pt-BR.resx b/OneMore/Properties/Resources.pt-BR.resx index 27b80eee22..6fa873a862 100644 --- a/OneMore/Properties/Resources.pt-BR.resx +++ b/OneMore/Properties/Resources.pt-BR.resx @@ -1535,11 +1535,6 @@ Fundo Amarelo Largura de redimensionamento preferida label - - O OneNote não pode importar arquivos markdown de caminhos que contenham espaços: -{0} - error message - Arquivo: label diff --git a/OneMore/Properties/Resources.resx b/OneMore/Properties/Resources.resx index d400cd49a5..16b5726eb7 100644 --- a/OneMore/Properties/Resources.resx +++ b/OneMore/Properties/Resources.resx @@ -1535,11 +1535,6 @@ Yellow Background Preferred resize width label - - OneNote cannot import markdown files from paths containing spaces: -{0} - error message - File: label diff --git a/OneMore/Properties/Resources.zh-CN.resx b/OneMore/Properties/Resources.zh-CN.resx index f42c37edc4..307aa4474b 100644 --- a/OneMore/Properties/Resources.zh-CN.resx +++ b/OneMore/Properties/Resources.zh-CN.resx @@ -1533,11 +1533,6 @@ OneNote 文件 (*.one) 首选调整宽度 label - - OneNote 无法从包含空格的路径导入 Markdown 文件： -{0} - error message - 文件： label