Ticket #40702: 40702-duplicate-translations.diff

src/wp-admin/includes/dashboard.php

@@ -1158 +1158 @@
                                 /* translators: accessibility text */
                                 __( '(opens in a new window)' )
                         );
                 ?>
         </p>
 
         <?php
 }
 
 /**
  * Prints the markup for the Community Events section of the Events and News Dashboard widget.
  *
  * @since 4.8.0
  */
 function wp_print_community_events_markup() {
-        $script_data = wp_get_community_events_script_data();
-
         ?>
 
         <div class="community-events-errors notice notice-error inline hide-if-js">
                 <p class="hide-if-js">
                         <?php _e( 'This widget requires JavaScript.'); ?>
                 </p>
 
                 <p class="community-events-error-occurred" aria-hidden="true">
-                        <?php echo $script_data['l10n']['error_occurred_please_try_again']; ?>
+                        <?php _e( 'An error occured. Please try again.' ); ?>
                 </p>
 
                 <p class="community-events-could-not-locate" aria-hidden="true"></p>
         </div>
 
         <div class="community-events-loading hide-if-no-js">
                 <?php _e( 'Loading&hellip;'); ?>
         </div>
 
         <?php
         /*
          * Hide the main element when the page first loads, because the content
          * won't be ready until wp.communityEvents.renderEventsTemplate() has run.
          */
         ?>
@@ -1223 +1221 @@
                         </form>
                 </div>
 
                 <ul class="community-events-results activity-block last"></ul>
         </div>
 
         <?php
 }
 
 /**
  * Renders the events templates for the Event and News widget.
  *
  * @since 4.8.0
  */
 function wp_print_community_events_templates() {
-        $script_data = wp_get_community_events_script_data();
-
         ?>
 
         <script id="tmpl-community-events-attend-event-near" type="text/template">
                 <?php printf(
                         /* translators: %s is a placeholder for the name of a city. */
                         __( 'Attend an upcoming event near %s.' ),
                         '<strong>{{ data.location }}</strong>'
                 ); ?>
         </script>
 
         <script id="tmpl-community-events-could-not-locate" type="text/template">
                 <?php printf(
-                        $script_data['l10n']['could_not_locate_city'],
+                        /* translators: %s is the name of the city we couldn't locate. Replace the examples with cities in your locale, but test that they match the expected location before including them. Use endonyms (native locale names) whenever possible. */
+                        __( "We couldn't locate %s. Please try another nearby city. For example: Kansas City; Springfield; Portland." ),
                         '<em>{{data.unknownCity}}</em>'
                 ); ?>
         </script>
 
         <script id="tmpl-community-events-event-list" type="text/template">
                 <# _.each( data.events, function( event ) { #>
                         <li class="event event-{{ event.type }} wp-clearfix">
                                 <div class="event-info">
                                         <div class="dashicons event-icon" aria-hidden="true"></div>
                                         <div class="event-info-inner">
                                                 <a class="event-title" href="{{ event.url }}">{{ event.title }}</a>
                                                 <span class="event-city">{{ event.location.location }}</span>
                                         </div>
                                 </div>