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.

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

i18n for the titles in the ArchiveWidget #284

Merged

Conversation

marcokernler
Copy link

No description provided.

@tractorcow
Copy link

Whitespace needs to be fixed please. :D Please use tabs for indentation.

@marcokernler
Copy link
Author

Converted the spaces to tabs :)

@dhensby
Copy link
Contributor

dhensby commented Jul 6, 2015

Please can you "fixup" the commits?

git reset HEAD^
git commit -a --amend --no-edit
git push --force

Edited bad git command

@marcokernler marcokernler force-pushed the locallized-archive-widget-titles branch from 1c0ecab to bce8420 Compare July 7, 2015 08:42
@marcokernler
Copy link
Author

I've executed your commands. So it's ok for now?

@dhensby
Copy link
Contributor

dhensby commented Jul 7, 2015

Himm, oops, I left a flag off of the commit line

Git commit -a --amend --no-edit

So your white space fixes didn't come through. Sorry....

@marcokernler marcokernler force-pushed the locallized-archive-widget-titles branch from bce8420 to 19689a9 Compare July 7, 2015 13:18
@marcokernler marcokernler force-pushed the locallized-archive-widget-titles branch from 19689a9 to 60b575b Compare July 7, 2015 13:21
@marcokernler
Copy link
Author

Are there any tasks left that should be done?

tractorcow pushed a commit that referenced this pull request Aug 20, 2015
…itles

i18n for the titles in the ArchiveWidget
@tractorcow tractorcow merged commit 4e78e58 into silverstripe:master Aug 20, 2015
@tractorcow
Copy link

Just that one.

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