Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/stefan-niedermann/nextcloud-notes.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Niedermann <info@niedermann.it>2021-10-13 11:40:40 +0300
committerStefan Niedermann <info@niedermann.it>2021-10-13 11:40:40 +0300
commit732bbf4b09862421828e4fb872df56121612cffc (patch)
tree4299e41eb721cbc266fc54ccf52247f7b92dd8fe /app/src/main
parent94fab6c8653f2f4669928de2722e1c397563f380 (diff)
Improve image formatting help
Signed-off-by: Stefan Niedermann <info@niedermann.it>
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/it/niedermann/owncloud/notes/FormattingHelpActivity.java5
-rw-r--r--app/src/main/res/values/strings.xml6
2 files changed, 9 insertions, 2 deletions
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/FormattingHelpActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/FormattingHelpActivity.java
index 5d4f8eba..91ef3724 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/FormattingHelpActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/FormattingHelpActivity.java
@@ -213,8 +213,11 @@ public class FormattingHelpActivity extends BrandedActivity {
lineBreak +
getString(R.string.formatting_help_title, getString(R.string.formatting_help_images_title)) + lineBreak +
lineBreak +
+ getString(R.string.formatting_help_images_body_1, getString(R.string.formatting_help_codefence_inline, getString(R.string.formatting_help_images_slash))) + lineBreak +
+ getString(R.string.formatting_help_images_body_2, getString(R.string.formatting_help_codefence_inline, getString(R.string.formatting_help_images_escaped_space))) + lineBreak +
+ lineBreak +
codefence + lineBreak +
- getString(R.string.formatting_help_image, getString(R.string.formatting_help_images_alt)) + lineBreak +
+ getString(R.string.formatting_help_image, getString(R.string.formatting_help_images_alt), getString(R.string.formatting_help_images_escaped_space)) + lineBreak +
codefence + lineBreak;
}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 69082a9f..3ed94ed6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -265,7 +265,7 @@
<string name="formatting_help_strike_through" translatable="false">~~</string>
<string name="formatting_help_bold" translatable="false">**</string>
<string name="formatting_help_italic" translatable="false">*</string>
- <string name="formatting_help_image" translatable="false">![%1$s](https://example.com/image.jpg)</string>
+ <string name="formatting_help_image" translatable="false">![%1$s](https://example.com/fancy%2$simage.jpg)</string>
<string name="formatting_help_cbf_title">Context based formatting</string>
<string name="formatting_help_cbf_body_1">A major design goal of the Notes app is to provide a distraction free tool. Though you will be able to format your texts with Markdown. For various of the below mentioned examples, you can use shortcuts so you can format your notes without typing in the codes below.</string>
@@ -309,6 +309,10 @@
<!-- Table cell value of a sample table -->
<string name="formatting_help_tables_value">Value %1d</string>
+ <string name="formatting_help_images_body_1">Links have to be either complete URLs starting with a protocol and domain or absolute paths starting with a %1$s character.</string>
+ <string name="formatting_help_images_body_2">Note that you have to escape the URL of images yourself because otherwise it is no valid markdown. This means for example, that you will have to replace spaces with %1$s in the URL.</string>
+ <string name="formatting_help_images_escaped_space" translatable="false" formatted="false">%20</string>
+ <string name="formatting_help_images_slash" translatable="false">/</string>
<string name="formatting_help_images_title">Images</string>
<string name="formatting_help_images_alt">Fancy image</string>