Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1935120 by larowlan: Fixed Unusual language use in tour module.

8.0.x
Dries 2013-03-13 17:39:07 -04:00
parent 0a82a3fc14
commit 2cb952f9bf
6 changed files with 32 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/modules/tour/tests/tour_test/config/locale.config.it.tour.tour.tour-test.yml Normal file
View File

@ -0,0 +1,5 @@
label: Tour test italian
tips:
tour-test-1:
label: La pioggia cade in spagna
body: Per lo più in pianura.

4
core/modules/tour/tests/tour_test/config/tour.tour.tour-test-2-en.yml → core/modules/tour/tests/tour_test/config/tour.tour.tour-test-2.yml
View File

@ -1,11 +1,11 @@
id: tour-test-2-en
id: tour-test-2
label: Tour test english
langcode: en
paths:
- tour-test-2/*
tips:
tour-test-2:
id: tour-test-2-en
id: tour-test-2
plugin: text
label: The quick brown fox
body: Per lo più in pianura.

14
core/modules/tour/tests/tour_test/config/tour.tour.tour-test-it.yml
View File

@ -1,14 +0,0 @@
id: tour-test-it
label: Tour test italian
langcode: it
paths:
- tour-test-1
tips:
tour-test-1-it:
id: tour-test-1-it
plugin: text
label: La pioggia cade in spagna
body: Per lo più in pianura.
weight: "1"
attributes:
data-id: tour-test-1

6
core/modules/tour/tests/tour_test/config/tour.tour.tour-test-en.yml → core/modules/tour/tests/tour_test/config/tour.tour.tour-test.yml
View File

@ -1,11 +1,11 @@
id: tour-test-en
id: tour-test
label: Tour test english
langcode: en
paths:
- tour-test-1
tips:
tour-test-1:
id: tour-test-1-en
id: tour-test-1
plugin: text
label: The first tip
body: Is always the best dressed.
@ -13,7 +13,7 @@ tips:
attributes:
data-id: tour-test-1
tour-test-3:
id: tour-test-3-en
id: tour-test-3
plugin: image
label: The awesome image
url: http://local/image.png

6
core/modules/tour/tour.module
View File

@ -112,13 +112,9 @@ function tour_preprocess_page(&$variables) {
// @todo replace this with http://drupal.org/node/1918768 once it is committed.
$path = current_path();
$langcode = language(LANGUAGE_TYPE_CONTENT)->langcode;
$tour_items = array();
// Load all of the items and match on path.
$tour_ids = entity_query('tour')
->condition('langcode', $langcode)
->execute();
$tours = entity_load_multiple('tour', $tour_ids);
$tours = entity_load_multiple('tour');
$path_alias = drupal_strtolower(drupal_container()->get('path.alias_manager')->getPathAlias($path));
foreach ($tours as $tour_id => $tour) {

42
core/modules/views/views_ui/config/tour.tour.views-ui-en.yml → core/modules/views/views_ui/config/tour.tour.views-ui.yml
View File

@ -1,83 +1,83 @@
id: views-ui-en
id: views-ui
label: Views ui
langcode: en
paths:
- admin/structure/views/view/*/edit
tips:
views-ui-active-display-en:
id: views-ui-active-display-en
views-ui-active-display:
id: views-ui-active-display
plugin: text
label: Active display
body: This is the active display in the view. When there are multiple displays, one link for each display is shown and you can switch displays simply by clicking on the display link.
weight: "2"
attributes:
data-class: views-display-top li.active
views-ui-displays-en:
id: views-ui-displays-en
views-ui-displays:
id: views-ui-displays
plugin: text
label: Displays in this view
body: A view can consist of multiple displays. A display is a way of outputting the results E.g. as a page or in a block. The available displays in your view are show here.
weight: "1"
attributes:
data-id: views-display-top
views-ui-fields-en:
id: views-ui-fields-en
views-ui-fields:
id: views-ui-fields
plugin: text
label: Fields
body: This section shows the fields output for each result. Depending on the format selected for the view, you may not see anything listed here. If the format of your view uses fields, you can click on each field displayed to configure it.
weight: "5"
attributes:
data-class: views-ui-display-tab-bucket.fields
views-ui-filter-en:
id: views-ui-filter-en
views-ui-filter:
id: views-ui-filter
plugin: text
label: Filter your view
body: This section displays the filters you have active in your view. A filter is used to limit the results available in the output. E.g. to only show content that was <em>published</em>, you would add a filter for <em>Published</em> and select <em>Yes</em>.
weight: "6"
attributes:
data-class: views-ui-display-tab-bucket.filter-criteria
views-ui-filter-operations-en:
id: views-ui-filter-operations-en
views-ui-filter-operations:
id: views-ui-filter-operations
plugin: text
label: Filter actions
body: Use this drop-button to add and re-arrange filters
weight: "7"
attributes:
data-class: views-ui-display-tab-bucket.filter-criteria .dropbutton-widget
views-ui-format-en:
id: views-ui-format-en
views-ui-format:
id: views-ui-format
plugin: text
label: Output format
body: Use this section to manage the format of the output results. You can choose different ways in which the matching results are output. E.g. Choose <em>Content</em> to output each item completely, using your configured display settings. Other options include <em>Fields</em> which allows you to output only specific fields on each matching result. Additional formats can be added by installing additional modules to <em>extend</em> Drupal's base functionality.
weight: "4"
attributes:
data-class: views-ui-display-tab-bucket.format
views-ui-preview-en:
id: views-ui-preview-en
views-ui-preview:
id: views-ui-preview
plugin: text
label: Preview
body: Use this button to show a preview of the view output
weight: "10"
attributes:
data-id: preview-submit
views-ui-sorts-en:
id: views-ui-sorts-en
views-ui-sorts:
id: views-ui-sorts
plugin: text
label: Sort Criteria
body: This section shows the enabled sorting criteria for the view. Sorting criteria are used to control the order in which the results are output. Clicking on any of the active sorting criteria shown in this section enables you to configure it.
weight: "8"
attributes:
data-class: views-ui-display-tab-bucket.sort-criteria
views-ui-sorts-operations-en:
id: views-ui-sorts-operations-en
views-ui-sorts-operations:
id: views-ui-sorts-operations
plugin: text
label: Sort actions
body: Use this drop-button to add and re-arrange the sorting criteria.
weight: "9"
attributes:
data-class: views-ui-display-tab-bucket.sort-criteria .dropbutton-widget
views-ui-view-admin-en:
id: views-ui-view-admin-en
views-ui-view-admin:
id: views-ui-view-admin
plugin: text
label: View administration
body: Use this drop-button to perform administrative tasks on the view, including adding a description and creating a clone. Click the drop button to view the available options.