Skip to content

update copyright dates - #6501

Merged
adampalay merged 1 commit into
masterfrom
adam/update-copy-date
Jan 12, 2015
Merged

update copyright dates#6501
adampalay merged 1 commit into
masterfrom
adam/update-copy-date

Conversation

@adampalay

Copy link
Copy Markdown
Contributor

@singingwolfboy and @sarina
It's no longer 2014 :) 🎆

@adampalay

Copy link
Copy Markdown
Contributor Author

Oh nevermind, @sarina beat me to this (was working off an old branch) https://github.com/edx/edx-platform/pull/6458

Studio's footer still needs updating--i'll update this PR to just change studio's footer

@sarina

sarina commented Jan 8, 2015

Copy link
Copy Markdown
Contributor

@adampalay yep. You should cancel your build, too, to not tie up Jenkins.

@adampalay
adampalay force-pushed the adam/update-copy-date branch from 9f5f0d2 to 41f2c73 Compare January 8, 2015 18:29
@adampalay

Copy link
Copy Markdown
Contributor Author

@sarina and @singingwolfboy , ok, ready for review

@sarina

sarina commented Jan 8, 2015

Copy link
Copy Markdown
Contributor

LGTM. Actually though since you're in here, could you change the string in https://github.com/edx/edx-platform/blob/master/lms/templates/footer-edx-new.html#L35 to match the string in https://github.com/edx/edx-platform/blob/master/lms/templates/footer.html#L55 just so we aren't pushing 2 different translation strings to transifex? I don't know how I missed that.

Comment thread cms/templates/widgets/footer.html Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actually - can you make this use {platform_name}, too? We're trying to get all branding out of Studio as well as LMS. This should have been done in #6309 but was obviously missed.

@sarina

sarina commented Jan 8, 2015

Copy link
Copy Markdown
Contributor

@adampalay we want this particular copyright to be platform name. There's an upcoming OPen Source task for next week to add in a specific copyright notice to the LMS and Studio regarding the use of the edX logo and branding, that will hardcode in an edX copyright on the things we would copyright. But we don't own the copyright on another site.

@adampalay
adampalay force-pushed the adam/update-copy-date branch from 41f2c73 to 8fa00ea Compare January 8, 2015 19:46
@adampalay

Copy link
Copy Markdown
Contributor Author

@sarina , cool?

@sarina

sarina commented Jan 8, 2015

Copy link
Copy Markdown
Contributor

👍 verified in devstack

@singingwolfboy

Copy link
Copy Markdown
Contributor

👍

adampalay added a commit that referenced this pull request Jan 12, 2015
@adampalay
adampalay merged commit 8dd7b78 into master Jan 12, 2015
@adampalay
adampalay deleted the adam/update-copy-date branch January 12, 2015 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants