Skip to content
This repository was archived by the owner on Oct 29, 2020. It is now read-only.

dev -> global#5491

Merged
angaither merged 23 commits intoDoSomethingArchive:globalfrom
angaither:global
Oct 15, 2015
Merged

dev -> global#5491
angaither merged 23 commits intoDoSomethingArchive:globalfrom
angaither:global

Conversation

@angaither
Copy link
Contributor

fixed the merge commits locally, and merged dev into global

@blisteringherb @deadlybutter can you do a spot check that dosomething_global.module looks correct

Darren Douglas Lee aka Dee and others added 23 commits October 12, 2015 19:01
…ome-naviagtion-items

Allowing chrome nav items to be translateable.
If the t() function is nested inside the token_replace() function then it all kinda breaks and the tokens can't be replaced properly. Solution is to separate them out.
…-translate-bug

Fix bug with nesting t().
When I switched from testing if the theme settings were falsey (which
was failing on ""), I left the "!" in there. I am not a clever man.
…r_country

Add dosomething_global_convert_language_to_country() lookup to user registration mbp call
These variables are defined, but never used in this scope
(dosomething_user_form_alter).
Use Drupal’s `hook_user_login` and `hook_user_insert` to add custom
events to the following page load on login/registration.
* After dev is merged back in to global, which will remove the code
  necessary to make signup email links work, this code needs to be
  readded.
…-signup-prefix

Removing code that adds a prefix to signup email link
Putting these Drupal variables into pot files and having them translate was affecting the replacement of them in code for Droooopal.
This makes more sense, since hook_insert_user seems to be
intended more for database-related changes. I've also split
message broker logic into a new "private" method for better
readability.
…-olé

Removing item from pot file that should not be translated.
Removes regional admin access from misc. menu's
…cs-kerfuffle

Fix login and registration events
Conflicts:
	lib/modules/dosomething/dosomething_signup/dosomething_signup.module
@itsjoekent
Copy link
Contributor

I think its good to go

@blisteringherb
Copy link
Contributor

👍

angaither added a commit that referenced this pull request Oct 15, 2015
@angaither angaither merged commit d4d8695 into DoSomethingArchive:global Oct 15, 2015
@angaither angaither deleted the global branch October 15, 2015 16:53
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Development

Successfully merging this pull request may close these issues.

5 participants