Skip to content

[4.0] Fix language strings causing false plurals in crowdin #35681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 5, 2021
Merged

[4.0] Fix language strings causing false plurals in crowdin #35681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e7166bd
Fix content history language strings causing false plurals in crowdin
richard67 Sep 27, 2021
16101e9
Move comments to end of line
richard67 Sep 27, 2021
df3e40b
Fix similar tags module language string causing false plurals in crowdin
richard67 Sep 27, 2021
1528691
Don't deprecate but remove the language strings
richard67 Oct 3, 2021
3b133cf
Merge branch '4.0-dev' into 4.0-dev-fix-language-string-wrong-crowdin…
richard67 Oct 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions administrator/components/com_contenthistory/tmpl/history/modal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
$hash = $this->state->get('sha1_hash');
$formUrl = 'index.php?option=com_contenthistory&view=history&layout=modal&tmpl=component&item_id=' . $this->state->get('item_id') . '&' . Session::getFormToken() . '=1';

Text::script('COM_CONTENTHISTORY_BUTTON_SELECT_ONE', true);
Text::script('COM_CONTENTHISTORY_BUTTON_SELECT_TWO', true);
Text::script('COM_CONTENTHISTORY_BUTTON_SELECT_ONE_VERSION', true);
Text::script('COM_CONTENTHISTORY_BUTTON_SELECT_TWO_VERSIONS', true);
Text::script('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST');

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
Expand Down
4 changes: 2 additions & 2 deletions administrator/language/en-GB/com_contenthistory.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ COM_CONTENTHISTORY_BUTTON_LOAD="Restore"
COM_CONTENTHISTORY_BUTTON_LOAD_DESC="This button loads the selected version into the edit form."
COM_CONTENTHISTORY_BUTTON_PREVIEW="Preview"
COM_CONTENTHISTORY_BUTTON_PREVIEW_DESC="This button allows you to see a preview of the selected version."
COM_CONTENTHISTORY_BUTTON_SELECT_ONE="Please select one version."
COM_CONTENTHISTORY_BUTTON_SELECT_TWO="Please select two versions."
COM_CONTENTHISTORY_BUTTON_SELECT_ONE_VERSION="Please select one version."
COM_CONTENTHISTORY_BUTTON_SELECT_TWO_VERSIONS="Please select two versions."
COM_CONTENTHISTORY_CHARACTER_COUNT="Character Count"
COM_CONTENTHISTORY_COMPARE_CAPTION="Table comparing two versions."
COM_CONTENTHISTORY_COMPARE_DIFF="Changes"
Expand Down
6 changes: 3 additions & 3 deletions build/media_source/com_contenthistory/js/admin-history-modal.es6.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
}
} else {
// @todo use the CE Modal here
alert(Joomla.Text._('COM_CONTENTHISTORY_BUTTON_SELECT_ONE'));
alert(Joomla.Text._('COM_CONTENTHISTORY_BUTTON_SELECT_ONE_VERSION'));
}
return false;
});
Expand All @@ -36,7 +36,7 @@
}
} else {
// @todo use the CE Modal here
alert(Joomla.Text._('COM_CONTENTHISTORY_BUTTON_SELECT_ONE'));
alert(Joomla.Text._('COM_CONTENTHISTORY_BUTTON_SELECT_ONE_VERSION'));
}
return false;
});
Expand All @@ -55,7 +55,7 @@
}
} else {
// @todo use the CE Modal here
alert(Joomla.Text._('COM_CONTENTHISTORY_BUTTON_SELECT_TWO'));
alert(Joomla.Text._('COM_CONTENTHISTORY_BUTTON_SELECT_TWO_VERSIONS'));
}
return false;
});
Expand Down
2 changes: 1 addition & 1 deletion language/en-GB/mod_tags_similar.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ MOD_TAGS_SIMILAR_FIELD_ALL="All"
MOD_TAGS_SIMILAR_FIELD_HALF="Half"
MOD_TAGS_SIMILAR_FIELD_MATCHTYPE_DESC="How closely an item's tags need to match. All - requires that all tags in the displayed item be matched. Any - requires that at least one tag match. Half - requires that at least half of the tags match (rounded up in the case of decimals)."
MOD_TAGS_SIMILAR_FIELD_MATCHTYPE_LABEL="Match Type"
MOD_TAGS_SIMILAR_FIELD_ONE="Any"
MOD_TAGS_SIMILAR_FIELD_ONE_TAG="Any"
MOD_TAGS_SIMILAR_FIELD_ORDERING_COUNT="Number of matching tags"
MOD_TAGS_SIMILAR_FIELD_ORDERING_COUNT_AND_RANDOM="Number of matching tags & Random"
MOD_TAGS_SIMILAR_FIELD_ORDERING_LABEL="Order Results"
Expand Down
2 changes: 1 addition & 1 deletion modules/mod_tags_similar/mod_tags_similar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
validate="options"
>
<option value="all">MOD_TAGS_SIMILAR_FIELD_ALL</option>
<option value="any">MOD_TAGS_SIMILAR_FIELD_ONE</option>
<option value="any">MOD_TAGS_SIMILAR_FIELD_ONE_TAG</option>
<option value="half">MOD_TAGS_SIMILAR_FIELD_HALF</option>
</field>

Expand Down