Skip to content
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

Jump to bottom

Small Grammar change #11788

Merged
merged 10 commits into from
Aug 25, 2016
Merged

Small Grammar change #11788

merged 10 commits into from
Aug 25, 2016

Conversation

brianteeman
Copy link
Contributor

@brianteeman brianteeman commented Aug 25, 2016 •
edited by jeckodevelopment
Loading

Before

... has to also be a published Content language.

After

... also has to be a published Content language.

@joomla-cms-bot joomla-cms-bot added Language Change This is for Translators PR-staging labels Aug 25, 2016
@MATsxm
Copy link

MATsxm commented Aug 25, 2016

I have tested this item ✅ successfully on a546b41

on code review - thanks

This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/11788.

@jeckodevelopment
Copy link
Member

I have tested this item ✅ successfully on a546b41

This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/11788.

@jeckodevelopment
Copy link
Member

RTC

This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/11788.

@joomla-cms-bot joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Aug 25, 2016
@jeckodevelopment jeckodevelopment added this to the Joomla 3.6.3 milestone Aug 25, 2016
@rdeutz rdeutz merged commit 37f99c3 into joomla:staging Aug 25, 2016
@brianteeman
Copy link
Contributor Author

Thanks

@joomla-cms-bot joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label Aug 25, 2016
@brianteeman brianteeman deleted the grammar branch August 25, 2016 20:31
roland-d pushed a commit to roland-d/joomla-cms that referenced this pull request Sep 11, 2016
@brianteeman @roland-d
Small Grammar change (joomla#11788)
9d783ce 
* toolbar

* Revert "toolbar"

This reverts commit 8f995f1.

* Small grammar fix
roland-d added a commit to roland-d/joomla-cms that referenced this pull request Sep 11, 2016
@roland-d
Merge remote-tracking branch 'origin/shareable-draft-content' into sh…
0ff1886 
…areable-draft-content

* origin/shareable-draft-content: (245 commits)
  Implement shareable draft links
  Cleaned up shared drafts view Added front-end token generarion
  Implement shared drafts view
  Remove obsolete file
  use only root (joomla#11703)
  com_search category results not displaying date (joomla#11802)
  warnings and errors, not notices ... (joomla#11801)
  [installation] Add javascript message titles and ajax errors strings (joomla#11800)
  Regression: Normalising head links and correcting hreflang for menu items associations (joomla#11769)
  Refactor allowEdit of backend category controller (joomla#11547)
  [com_contact] Move event trigger to correct place (joomla#11719)
  Improve the accessibility of the top menu in ISIS part 2 (joomla#11729)
  Show file extension (joomla#11776)
  change button -> a for the modal close button (joomla#11787)
  Small Grammar change (joomla#11788)
  Change message type to error when download of update package fails (joomla#11791)
  these are warnings not messages ... (joomla#11799)
  [plg_content_vote|pagebreak] Load language files only when needed (joomla#11730)
  [plg_system_stats] Load plugin language files only when needed (joomla#11728)
  Fix creation performance of form element menuparent, (slow down in menu item edit form, for item that belongs to large menu) (joomla#11628)
  ...

# Conflicts:
#	administrator/components/com_admin/script.php
#	administrator/components/com_content/models/shared.php
#	administrator/components/com_content/views/shared/tmpl/default.php
#	administrator/language/en-GB/en-GB.xml
#	administrator/language/en-GB/install.xml
#	administrator/manifests/files/joomla.xml
#	administrator/manifests/packages/pkg_en-GB.xml
#	installation/language/en-GB/en-GB.xml
#	language/en-GB/en-GB.xml
#	language/en-GB/install.xml
#	libraries/cms/pagination/pagination.php
#	libraries/cms/version/version.php
#	libraries/joomla/authentication/authentication.php
#	libraries/joomla/form/fields/color.php
#	libraries/joomla/form/fields/email.php
#	media/system/js/share-uncompressed.js
#	media/system/js/share.js
#	plugins/content/vote/vote.php
roland-d added a commit to roland-d/joomla-cms that referenced this pull request Sep 11, 2016
@roland-d
Merge remote-tracking branch 'origin/shareable-draft-content' into sh…
3903bef 
…areable-draft-content

* origin/shareable-draft-content: (253 commits)
  Fixed conflict
  Added menu item
  Code cleanup
  Implement shareable draft links
  Cleaned up shared drafts view Added front-end token generarion
  Implement shared drafts view
  Remove obsolete file
  use only root (joomla#11703)
  com_search category results not displaying date (joomla#11802)
  warnings and errors, not notices ... (joomla#11801)
  [installation] Add javascript message titles and ajax errors strings (joomla#11800)
  Regression: Normalising head links and correcting hreflang for menu items associations (joomla#11769)
  Refactor allowEdit of backend category controller (joomla#11547)
  [com_contact] Move event trigger to correct place (joomla#11719)
  Improve the accessibility of the top menu in ISIS part 2 (joomla#11729)
  Show file extension (joomla#11776)
  change button -> a for the modal close button (joomla#11787)
  Small Grammar change (joomla#11788)
  Change message type to error when download of update package fails (joomla#11791)
  these are warnings not messages ... (joomla#11799)
  ...

# Conflicts:
#	administrator/components/com_admin/script.php
#	administrator/components/com_content/controllers/article.php
#	administrator/components/com_content/controllers/articles.php
#	administrator/components/com_content/models/forms/article.xml
#	administrator/components/com_content/views/article/view.html.php
#	administrator/components/com_content/views/articles/view.html.php
#	components/com_content/views/form/tmpl/edit.php
#	libraries/cms/pagination/pagination.php
#	libraries/joomla/form/fields/email.php
#	plugins/content/vote/vote.php
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Language Change This is for Translators
Projects
None yet
Milestone
Joomla 3.6.3
Development

Successfully merging this pull request may close these issues.
5 participants
@brianteeman @MATsxm @jeckodevelopment @rdeutz @joomla-cms-bot