Skip to content

Simplify some strings#11265

Merged
rdeutz merged 7 commits intojoomla:stagingfrom
brianteeman:showhide
Aug 16, 2016
Merged

Simplify some strings#11265
rdeutz merged 7 commits intojoomla:stagingfrom
brianteeman:showhide

Conversation

@brianteeman
Copy link
Copy Markdown
Contributor

@brianteeman brianteeman commented Jul 23, 2016 •
edited
Loading

This mainly removes use of the word "whether" and standardises some strings to use "show or hide". It is simpler English and more consistent across all the strings

Note if you grep the language files for the word "whether" there may be some instances still present because those language strings are not used any more in core.

Testing - please check for typos

@joomla-cms-bot joomla-cms-bot added Language Change This is for Translators PR-staging labels Jul 23, 2016
andrepereiradasilva
andrepereiradasilva reviewed Jul 23, 2016
View reviewed changes
administrator/language/en-GB/en-GB.com_contact.ini Outdated
COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_DESC="Show or hide city or suburb."
COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_LABEL="City or Suburb"
COM_CONTACT_FIELD_PARAMS_VCARD_DESC="Whether or not to allow export to vCard format."
COM_CONTACT_FIELD_PARAMS_VCARD_DESC="WShow or hide a link to allow export to vCard format."
Copy link
Copy Markdown
Contributor

@andrepereiradasilva andrepereiradasilva Jul 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WShow?

Copy link
Copy Markdown
Contributor Author

@brianteeman brianteeman Jul 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I said there might be typos ;)

MATsxm
MATsxm reviewed Jul 23, 2016
View reviewed changes
administrator/language/en-GB/en-GB.com_content.ini Outdated
COM_CONTENT_CREATE_ARTICLE_CATEGORY_DESC="If set to 'Yes', this page will only let you create articles in the category selected below."
COM_CONTENT_DRILL_CATEGORIES_LABEL="List or Blog: after choosing the display,<br />make sure you define the Options in the desired layout."
COM_CONTENT_DRILL_DOWN_LAYOUT_DESC="When drilling down to a category, whether to show articles in a list or blog layout."
COM_CONTENT_DRILL_DOWN_LAYOUT_DESC="When drilling down to a category show articles in a list or blog layout."
Copy link
Copy Markdown

@MATsxm MATsxm Jul 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When drilling down to a category, show articles in a list or blog layout.
Keeping the comma here?
Must be my franglish, but this one is not "clear" to me.

Copy link
Copy Markdown
Contributor Author

@brianteeman brianteeman Jul 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK will do to keep you happy ;)

@zero-24
Copy link
Copy Markdown
Contributor

zero-24 commented Jul 23, 2016

I have tested this item ✅ successfully on 19e40ea

looks good now

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

@jeckodevelopment
Copy link
Copy Markdown
Member

jeckodevelopment commented Jul 24, 2016

I have tested this item ✅ successfully on 19e40ea

@brianteeman
Copy link
Copy Markdown
Contributor Author

brianteeman commented Jul 24, 2016

RTC - thanks for testing

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

@joomla-cms-bot joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Jul 24, 2016
@brianteeman brianteeman added this to the Joomla 3.6.2 milestone Jul 25, 2016
@rdeutz
Copy link
Copy Markdown
Contributor

rdeutz commented Aug 13, 2016

@brianteeman could you have a look at the merge conflicts, thanks.

@brianteeman
Copy link
Copy Markdown
Contributor Author

brianteeman commented Aug 13, 2016

@rdeutz yeah I was waiting for all the other PR to be merged first as I would have had to do it again

@brianteeman
Copy link
Copy Markdown
Contributor Author

brianteeman commented Aug 13, 2016

I give up - my local git say it is upto date

@brianteeman
Copy link
Copy Markdown
Contributor Author

brianteeman commented Aug 14, 2016

@zero-24 can you take a look at this one as well please - one day I will understand git but that day is not today

zero-24 and others added 2 commits August 14, 2016 17:57
@brianteeman
Copy link
Copy Markdown
Contributor Author

brianteeman commented Aug 14, 2016

@zero-24 thanks for fixing the merge conflicts

@rdeutz this can be merged now - thanks

@truptikagathara
Copy link
Copy Markdown

truptikagathara commented Aug 15, 2016

I have tested this item ✅ successfully on 62b7b90

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

@rdeutz
Copy link
Copy Markdown
Contributor

rdeutz commented Aug 16, 2016

Travis fails because a script has moved, I going to merge this anyway, hoping the internet will not implode

@rdeutz rdeutz merged commit 68115ca into joomla:staging Aug 16, 2016
@brianteeman
Copy link
Copy Markdown
Contributor Author

brianteeman commented Aug 17, 2016

Thanks

@joomla-cms-bot joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label Aug 17, 2016
@brianteeman brianteeman deleted the showhide branch August 17, 2016 10:18
@infograf768
Copy link
Copy Markdown
Member

infograf768 commented Aug 17, 2016 •
edited
Loading

+MOD_LANGUAGES_FIELD_CACHING_DESC="Use the global cache setting the content of this module or disable caching for this module.<br />This should be set to 'No caching' when using Items Associations."
"setting the content" does not make sense to me.

Should'nt it be?
+MOD_LANGUAGES_FIELD_CACHING_DESC="Use the global cache setting to cache the content of this module or disable caching for this module.<br />This should be set to 'No caching' when using Items Associations."

@jeckodevelopment jeckodevelopment mentioned this pull request Aug 17, 2016
Merged
@mbabker
Copy link
Copy Markdown
Contributor

mbabker commented Aug 17, 2016

Somewhat off topic but why can't this module be cached with associations in use? That seems like a bug.

@jeckodevelopment
Copy link
Copy Markdown
Member

jeckodevelopment commented Aug 17, 2016

@infograf768 I opened PR #11641 to fix the string.
@mbabker I'm not sure I got your report

@mbabker
Copy link
Copy Markdown
Contributor

mbabker commented Aug 17, 2016

The language string JM's pointing out says that mod_languages should have caching disabled if item associations are in use. That doesn't seem right at all.

ggppdk pushed a commit to ggppdk/joomla-cms that referenced this pull request Aug 19, 2016
@brianteeman @ggppdk
Simplify some strings (joomla#11265)
bfd3d5c 
* Simplify strings

* oops

* comma

* caps

* caps again
roland-d pushed a commit to roland-d/joomla-cms that referenced this pull request Sep 11, 2016
@brianteeman @roland-d
Simplify some strings (joomla#11265)
49e047f 
* Simplify strings

* oops

* comma

* caps

* caps again
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.

10 participants

@brianteeman @zero-24 @jeckodevelopment @rdeutz @truptikagathara @infograf768 @mbabker @MATsxm @andrepereiradasilva @joomla-cms-bot