Skip to content

Correcting strings in TFA Google plugin#12980

Merged
wilsonge merged 2 commits intojoomla:stagingfrom
Bakual:CorrectString
Nov 24, 2016
Merged

Correcting strings in TFA Google plugin#12980
wilsonge merged 2 commits intojoomla:stagingfrom
Bakual:CorrectString

Conversation

@Bakual
Copy link
Copy Markdown
Contributor

@Bakual Bakual commented Nov 22, 2016 •
edited by jeckodevelopment
Loading

One of our translators raised an issue on Crowdin regarding the source strings in the Google Authenticator Two Factor Authentication plugin.

Summary of Changes

  • Removes a duplicated "Google Authenticator"
  • Removes a space in an anchor tag before "FreeOTP"
    googletotp

Testing Instructions

Check the plugin description and see that it is correct now.

Documentation Changes Required

None

@joomla-cms-bot joomla-cms-bot added Language Change This is for Translators PR-staging labels Nov 22, 2016
@brianteeman
Copy link
Copy Markdown
Contributor

brianteeman commented Nov 22, 2016

Something went wrong somewhere. It was supposed to be a link to the
Wikipedia page iirc

On 22 Nov 2016 7:32 p.m., "Thomas Hunziker" notifications@github.com
wrote:

One of our translators raised an issue on Crowdin regarding the source
strings in the Google Authenticator Two Factor Authentication plugin.
Summary of Changes

Testing Instructions

Check the plugin description and see that it is correct now.
Documentation Changes Required

None

You can view, comment on, or merge this pull request online at:

#12980
Commit Summary

  • Remove duplicate "Google Authenticator" and a space within an anchor
    tag.

File Changes

Patch Links:

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
#12980, or mute the thread
https://github.com/notifications/unsubscribe-auth/ABPH8bONYeDQ5YCbV3374nozSph34EcLks5rA0NXgaJpZM4K52Ro
.

@andrepereiradasilva
Copy link
Copy Markdown
Contributor

andrepereiradasilva commented Nov 22, 2016

I have tested this item ✅ successfully on 0eed57f

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

@Bakual
Copy link
Copy Markdown
Contributor Author

Bakual commented Nov 22, 2016 •
edited
Loading

Something went wrong somewhere.

@brianteeman Looks certainly like something went wrong 😄
PR that introduced it is indeed from you: #12833
Should be correct now, right?

@jeckodevelopment
Copy link
Copy Markdown
Member

jeckodevelopment commented Nov 22, 2016

I have tested this item ✅ successfully on 0eed57f

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

@jeckodevelopment
Copy link
Copy Markdown
Member

jeckodevelopment commented Nov 22, 2016

RTC

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

@joomla-cms-bot joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Nov 22, 2016
@jeckodevelopment jeckodevelopment added this to the Joomla 3.7.0 milestone Nov 22, 2016
@brianteeman
Copy link
Copy Markdown
Contributor

brianteeman commented Nov 22, 2016

I would prefer it if we were consistent and either made Google and freeotp links in the first string or neither of them

@Bakual
Copy link
Copy Markdown
Contributor Author

Bakual commented Nov 22, 2016

You mean in the other string (PLG_TWOFACTORAUTH_TOTP_STEP1_TEXT)? In the description I left the link and deleted the superfluous "Google Authenticator" after the link. So that should be fine now.

@brianteeman
Copy link
Copy Markdown
Contributor

brianteeman commented Nov 22, 2016

I mean there is only a link to freeotp in that string . The others have a link to Google authenticator as well. It was the failure to paste the link correctly in the first place by me that gave the double text

@joomla-cms-bot joomla-cms-bot removed the Language Change This is for Translators label Nov 23, 2016
@Bakual
Copy link
Copy Markdown
Contributor Author

Bakual commented Nov 23, 2016

Ah I see. Added the link there as well.

@brianteeman
Copy link
Copy Markdown
Contributor

brianteeman commented Nov 23, 2016

Thanks

@wilsonge wilsonge merged commit 81142af into joomla:staging Nov 24, 2016
@joomla-cms-bot joomla-cms-bot added Language Change This is for Translators and removed RTC This Pull Request is Ready To Commit labels Nov 24, 2016
@Bakual Bakual deleted the CorrectString branch November 24, 2016 10:01
roland-d added a commit to roland-d/joomla-cms that referenced this pull request Nov 25, 2016
@roland-d
Merge branch 'staging' into shareable-draft-content-feature
4823b55 
* staging: (98 commits)
  Coding style. PHP constants true, false, and null MUST be in lower case. (joomla#13010)
  Removing duplicated AS in sql query (joomla#13006)
  Fixed typo in comment (joomla#12992)
  Correcting strings in TFA Google plugin (joomla#12980)
  code style changes (joomla#12986)
  Error in sr-YU installation ini file (joomla#12984)
  New DateTime picker (replaces calendar) (joomla#11138)
  Export of Banners Tracks Does Not Export the Banner Name
  fix rues get data (joomla#12763)
  Added Feature items filter to mod_articles_news (joomla#12547)
  fix them all (joomla#12943)
  a11y regression fix (joomla#12935)
  Set correct component id for system links (joomla#12938)
  Fix for Undefined offset in Content History preview popup (joomla#12791)
  remove tab on meta charset (joomla#12895)
  JSession patched to set session _state to 'inactive' when session is closed. (joomla#12928)
  [JHtmlNumber::bytes] Format number according to language (joomla#12929)
  Update edit.php (joomla#12818)
  Update default.xml (joomla#12917)
  Adding the ability to use the global value for character count in newsfeeds (joomla#12869)
  ...
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.7.0

Development

Successfully merging this pull request may close these issues.

6 participants

@Bakual @brianteeman @andrepereiradasilva @jeckodevelopment @wilsonge @joomla-cms-bot