Update tabs.py

[oliviermarquez]

fixes tab buttons of student's dahsboard for i18n

[cpennington]

This is a regular python file, not a mako template, so you don't need to the extra {} around the call to _.

[adampalay]

needs to import ugettext:
from django.utils.translation import ugettext as _

[sarina]

With respect to breaking long lines, please see https://github.com/edx/edx-platform/wiki/Python-Guidelines

It's more readable to be like

course.tabs = [
    {"type": "courseware"},
    ....
    {"type": "progress", "name": _("Progress")},
]

The trailing comma I put at the end of "progress" line is OK - it's Python! 😄

[sarina]

Aside from doing the import as Adam asks, can you please also squash your commits down to one commit, since this is such a minor change? See http://git-scm.com/book/en/Git-Tools-Rewriting-History

The way you do is via an interactive rebase.

[oliviermarquez]

code was added in this file since my fork.

do i need to fork it again ?

[sarina]

You might just want to close this PR, make a new fork, and apply your changes freshly. Then open a new PR. I think that's the easiest route.

[sarina]

The benefit of that approach too is you will not have to rebase as you can make all the changes, incorporating review comments, in just one commit.

[adampalay]

I don't think you need to. You can rebase your branch onto edx's latest master by running:

$ git fetch --all; git rebase edx/master

[adampalay]

actually I agree with sarina, I'd just open a new pr :)

[sarina]

@oliviermarquez we'd like to keep our PRs pruned as much as possible. If you plan to open a new PR, please close this one. Otherwise, please update it and comment when you've made the update. Thanks!

[nparlante]

Hey I just noticed this going by by dumb chance. You should probably
update the primitive_insert as well at the bottom of tabs.py file.

Cheers,

Nick

On 10/7/13 8:04 AM, Sarina Canelake wrote:

@oliviermarquez https://github.com/oliviermarquez we'd like to keep
our PRs pruned as much as possible. If you plan to open a new PR,
please close this one. Otherwise, please update it and comment when
you've made the update. Thanks!

—
Reply to this email directly or view it on GitHub
https://github.com/edx/edx-platform/pull/757#issuecomment-25815958.

[ovnicraft]

@oliviermarquez Hi will you open a new PR ? i am working in this we can colaborate.

[oliviermarquez]

last PR was about words not checked to be translated (working on french
translation).
I need to create an actual instance, sandbox of edx, use it a little to
find buttons, menus, pages that were forgotten.
It also help me to find a better translation for some words, some
sentences, as i can see them in their context.

i have no pr ready to submit actually.

2013/10/30 Cristian Salamea notifications@github.com

@oliviermarquez https://github.com/oliviermarquez Hi will you open a
new PR ? i am working in this we can colaborate.

—
Reply to this email directly or view it on GitHubhttps://github.com/edx/edx-platform/pull/757#issuecomment-27410395
.

[ovnicraft]

@oliviermarquez Ok, i can work in this and make a PR.

[sarina]

@ovnicraft if you look, @oliviermarquez updated the pull request a few times, first #1234 then #1489 finally #1507 (this is not advised, we prefer that you keep the same pull request open and perform rebasing). However - click through those PRs to see the discussion that was made. A version of this code was finally merged in #1507

[ovnicraft]

@sarina Yes, i see it was merged.

Thanks for comment !