Skip to content

Commit

Permalink
Merge pull request #3746 from wordpress-mobile/release/1.58.0
Browse files Browse the repository at this point in the history
Release 1.58.0
  • Loading branch information
SiobhyB authored Jul 22, 2021
2 parents 45b8315 + 97a61ee commit 0028fdc
Show file tree
Hide file tree
Showing 23 changed files with 2,704 additions and 2,266 deletions.
4 changes: 4 additions & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Unreleased
------

1.58.0
------
* [***] New Block: Embed block. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3727]

1.57.1
------
* [*] Fix slider and stepper text inputs in dark mode [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3724]
Expand Down
17 changes: 8 additions & 9 deletions bin/generate-podspecs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,21 @@ if [[ -z "$COMMIT_HASH" ]]; then
fi

DEST="${WD}/third-party-podspecs"
read -r -p "Please delete '$DEST' folder manually before continuing. This script will re-generate it. Did you delete it? [y/N] " PROMPT_RESPONSE_2
if [[ $PROMPT_RESPONSE_2 != "y" ]]; then
echo "Aborting."
exit 1
fi

mkdir $DEST

NODE_MODULES_DIR="gutenberg/node_modules"

# Generate the external (non-RN podspecs)
EXTERNAL_PODSPECS=$(find "$NODE_MODULES_DIR/react-native/third-party-podspecs" \
"$NODE_MODULES_DIR/@react-native-community/blur" \
"$NODE_MODULES_DIR/@react-native-community/masked-view" \
"$NODE_MODULES_DIR/@react-native-community/slider" \
"$NODE_MODULES_DIR/react-native-dark-mode" \
"$NODE_MODULES_DIR/react-native-gesture-handler" \
"$NODE_MODULES_DIR/react-native-get-random-values" \
"$NODE_MODULES_DIR/react-native-keyboard-aware-scroll-view" \
Expand All @@ -63,14 +70,6 @@ do
echo "Generating podspec for $pod"
pod ipc spec "$podspec" > "$DEST/$pod.podspec.json"

# react-native-slider is the only gutenberg-mobile fork where we don't use the native files from the original repo
if [[ "$pod" == "react-native-slider" ]]; then
echo " ==> Patching $pod podspec"
TMP_RNSliderSpec=$(mktemp)
jq '.source.git = "https://github.com/wordpress-mobile/react-native-slider.git" | .source.commit = "d263ff16cdd9fb7352b354342522ff030f220f42" | del(.source.tag)' "$DEST/$pod.podspec.json" > "$TMP_RNSliderSpec"
mv "$TMP_RNSliderSpec" "$DEST/$pod.podspec.json"
fi

# react-native-blur doesn't have a tag field in it's podspec
if [[ "$pod" == "react-native-blur" ]]; then
echo " ==> Patching $pod podspec"
Expand Down
18 changes: 13 additions & 5 deletions bundle/android/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,7 @@
<string name="gutenberg_native_border_radius" tools:ignore="UnusedResources">Border Radius</string>
<string name="gutenberg_native_border_settings" tools:ignore="UnusedResources">Border Settings</string>
<string name="gutenberg_native_briefly_describe_the_link_to_help_screen_reader_user" tools:ignore="UnusedResources">Briefly describe the link to help screen reader user</string>
<string name="gutenberg_native_button_inside" tools:ignore="UnusedResources">Button inside</string>
<string name="gutenberg_native_button_link_url" tools:ignore="UnusedResources">Button Link URL</string>
<string name="gutenberg_native_button_outside" tools:ignore="UnusedResources">Button outside</string>
<string name="gutenberg_native_button_position" tools:ignore="UnusedResources">Button position</string>
<string name="gutenberg_native_cancel_search" tools:ignore="UnusedResources">Cancel search</string>
<string name="gutenberg_native_change_block_position" tools:ignore="UnusedResources">Change block position</string>
Expand Down Expand Up @@ -104,6 +102,8 @@
<string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_add_image_or_video" tools:ignore="UnusedResources">Double tap to open Bottom Sheet to add image or video</string>
<string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag" tools:ignore="UnusedResources">Double tap to open Bottom Sheet to edit, replace, or clear the image</string>
<string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options" tools:ignore="UnusedResources">Double tap to open Bottom Sheet with available options</string>
<string name="gutenberg_native_double_tap_to_preview_page" tools:ignore="UnusedResources">Double tap to preview page.</string>
<string name="gutenberg_native_double_tap_to_preview_post" tools:ignore="UnusedResources">Double tap to preview post.</string>
<string name="gutenberg_native_double_tap_to_redo_last_change" tools:ignore="UnusedResources">Double tap to redo last change</string>
<string name="gutenberg_native_double_tap_to_select" tools:ignore="UnusedResources">Double tap to select</string>
<string name="gutenberg_native_double_tap_to_select_a_video" tools:ignore="UnusedResources">Double tap to select a video</string>
Expand All @@ -125,13 +125,13 @@
<string name="gutenberg_native_edit_video" tools:ignore="UnusedResources">Edit video</string>
<string name="gutenberg_native_editing_reusable_blocks_is_not_yet_supported_on_wordpress_for_and" tools:ignore="UnusedResources">Editing reusable blocks is not yet supported on WordPress for Android</string>
<string name="gutenberg_native_editing_reusable_blocks_is_not_yet_supported_on_wordpress_for_ios" tools:ignore="UnusedResources">Editing reusable blocks is not yet supported on WordPress for iOS</string>
<string name="gutenberg_native_embed_block_previews_are_coming_soon" tools:ignore="UnusedResources">Embed block previews are coming soon</string>
<!-- translators: accessibility text. Empty Embed caption. -->
<string name="gutenberg_native_embed_caption_empty" tools:ignore="UnusedResources">Embed caption. Empty</string>
<!-- translators: accessibility text. %s: Embed caption. -->
<string name="gutenberg_native_embed_caption_s" tools:ignore="UnusedResources">Embed caption. %s</string>
<string name="gutenberg_native_embed_link" tools:ignore="UnusedResources">Embed link</string>
<!-- translators: %s: host providing embed content e.g: www.youtube.com -->
<string name="gutenberg_native_embedded_content_from_s_can_t_be_viewed_in_the_mobile_editor_at_t" tools:ignore="UnusedResources">Embedded content from %s can\'t be viewed in the mobile editor at the moment. Please preview the page to see the embedded content.</string>
<string name="gutenberg_native_embed_previews_not_yet_available" tools:ignore="UnusedResources">Embed previews not yet available</string>
<string name="gutenberg_native_error" tools:ignore="UnusedResources">Error</string>
<string name="gutenberg_native_excerpt_length_words" tools:ignore="UnusedResources">Excerpt length (words)</string>
<string name="gutenberg_native_failed_to_insert_audio_file" tools:ignore="UnusedResources">Failed to insert audio file.</string>
Expand Down Expand Up @@ -189,7 +189,7 @@
<string name="gutenberg_native_navigates_to_customize_the_gradient" tools:ignore="UnusedResources">Navigates to customize the gradient</string>
<string name="gutenberg_native_no_application_can_handle_this_request" tools:ignore="UnusedResources">No application can handle this request.</string>
<string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows" tools:ignore="UnusedResources">No application can handle this request. Please install a Web browser.</string>
<string name="gutenberg_native_no_button" tools:ignore="UnusedResources">No button</string>
<string name="gutenberg_native_no_blocks_found" tools:ignore="UnusedResources">No blocks found</string>
<string name="gutenberg_native_no_custom_placeholder_set" tools:ignore="UnusedResources">No custom placeholder set</string>
<string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes" tools:ignore="UnusedResources">Note: Column layout may vary between themes and screen sizes</string>
<string name="gutenberg_native_number_of_columns" tools:ignore="UnusedResources">Number of columns</string>
Expand All @@ -213,6 +213,8 @@
<string name="gutenberg_native_post_title_empty" tools:ignore="UnusedResources">Post title. Empty</string>
<!-- translators: accessibility text. %s: text content of the post title. -->
<string name="gutenberg_native_post_title_s" tools:ignore="UnusedResources">Post title. %s</string>
<string name="gutenberg_native_preview_page" tools:ignore="UnusedResources">Preview page</string>
<string name="gutenberg_native_preview_post" tools:ignore="UnusedResources">Preview post</string>
<string name="gutenberg_native_problem_displaying_block" tools:ignore="UnusedResources">Problem displaying block</string>
<string name="gutenberg_native_problem_opening_the_audio" tools:ignore="UnusedResources">Problem opening the audio</string>
<string name="gutenberg_native_problem_opening_the_video" tools:ignore="UnusedResources">Problem opening the video</string>
Expand Down Expand Up @@ -243,6 +245,7 @@
<string name="gutenberg_native_scrollable_block_menu_closed" tools:ignore="UnusedResources">Scrollable block menu closed.</string>
<string name="gutenberg_native_scrollable_block_menu_opened_select_a_block" tools:ignore="UnusedResources">Scrollable block menu opened. Select a block.</string>
<string name="gutenberg_native_search_block_label_current_text_is" tools:ignore="UnusedResources">Search block label. Current text is</string>
<string name="gutenberg_native_search_blocks" tools:ignore="UnusedResources">Search blocks</string>
<string name="gutenberg_native_search_button_current_button_text_is" tools:ignore="UnusedResources">Search button. Current button text is</string>
<string name="gutenberg_native_search_input_field" tools:ignore="UnusedResources">Search input field.</string>
<string name="gutenberg_native_search_or_type_url" tools:ignore="UnusedResources">Search or type URL</string>
Expand All @@ -264,7 +267,9 @@
<string name="gutenberg_native_transform_block" tools:ignore="UnusedResources">Transform block…</string>
<!-- translators: %s: block title e.g: "Paragraph". -->
<string name="gutenberg_native_transform_s_to" tools:ignore="UnusedResources">Transform %s to</string>
<string name="gutenberg_native_try_another_search_term" tools:ignore="UnusedResources">Try another search term</string>
<string name="gutenberg_native_type_a_url" tools:ignore="UnusedResources">Type a URL</string>
<string name="gutenberg_native_unable_to_embed_media" tools:ignore="UnusedResources">Unable to embed media</string>
<string name="gutenberg_native_ungroup" tools:ignore="UnusedResources">Ungroup</string>
<string name="gutenberg_native_unsupported" tools:ignore="UnusedResources">Unsupported</string>
<string name="gutenberg_native_updates_the_title" tools:ignore="UnusedResources">Updates the title.</string>
Expand All @@ -275,6 +280,9 @@
<!-- translators: accessibility text. %s: video caption. -->
<string name="gutenberg_native_video_caption_s" tools:ignore="UnusedResources">Video caption. %s</string>
<string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release" tools:ignore="UnusedResources">We are working hard to add more blocks with each release.</string>
<string name="gutenberg_native_we_re_working_hard_on_adding_support_for_embed_previews_in_the_me" tools:ignore="UnusedResources">We’re working hard on adding support for embed previews. In the meantime, you can preview the embedded content on the page.</string>
<string name="gutenberg_native_we_re_working_hard_on_adding_support_for_embed_previews_in_the_me_7978045c" tools:ignore="UnusedResources">We’re working hard on adding support for embed previews. In the meantime, you can preview the embedded content on the post.</string>
<string name="gutenberg_native_what_is_a_block" tools:ignore="UnusedResources">What is a block?</string>
<string name="gutenberg_native_what_is_alt_text" tools:ignore="UnusedResources">What is alt text?</string>
<string name="gutenberg_native_width_settings" tools:ignore="UnusedResources">Width Settings</string>
<string name="gutenberg_native_wordpress_media_library" tools:ignore="UnusedResources">WordPress Media Library</string>
Expand Down
Loading

0 comments on commit 0028fdc

Please sign in to comment.