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

Brazilian Portuguese Translation #41

Merged
merged 12 commits into from
Sep 16, 2016
Merged

Brazilian Portuguese Translation #41

merged 12 commits into from
Sep 16, 2016

Conversation

fermcg
Copy link
Contributor

@fermcg fermcg commented Sep 14, 2016

Brazilian Portuguese Translation v1.0.

@fermcg
Copy link
Contributor Author

fermcg commented Sep 14, 2016

Brazilian Portuguese Translation v1.2
Text improved to enhance understanding
Many terms normalized
Some errors fixed

@fermcg fermcg closed this Sep 14, 2016
@fermcg fermcg reopened this Sep 14, 2016
NPC -> PNJ
espacos de magia -> cargas magicas
Feiticeiro -> Conjurador
...
@brunobord
Copy link
Owner

brunobord commented Sep 15, 2016

A few suggestions:

Since this is the first published translation of TBH in Portuguese, maybe you can tag it as "1.0" version. When we'll merge it into master, it'll be published. Further fixes may be marked as 1.1 or 1.0.1 if needed.

A few things are missing if we follow the CONTRIBUTING document. That'd be great if you could have these ones checked:

  • You must add your contribution to the LICENSE file, in the last section.
  • You may add a line in the changelog describing your contribution.
  • Have a look at the section Specific styles. If you don't know how to handle it, leave it away, I will work this out.

Eventually, when you're completely sure that you're ready to merge, you may want to rebase and squash all these commits into one. This step is not mandatory, it's just to have a cleaner history, with less commits and make it more readable. If you can't or don't want to, don't worry, your PR will still be accepted

@fermcg
Copy link
Contributor Author

fermcg commented Sep 16, 2016

Hi,

LICENSE file -> ok
changelog -> ok
converting saves -> I don't know if it's right, but I added things to
base.html and test-slugify.py and it should work. I can't make html here (I
don't have 'make' in my home computer), but usually when I submit a pull
request there's something there on git hub that does it.

About version 1.0, you're talking about numbering the version in my fork
with this number right? Like folowing theses? https://help.github.com/
articles/creating-releases/ (I'm a little rusty in git, since I've used it
for some personal projects some time ago and in my day job people STILL use
CVS).

When I click the release pane, it shows your project's releases (which is
currently in 2.2.0). I've never did fork & sync so I'm a little lost here.

I've just made a pull request with things as they are. I guess only this
release part is still pending.

On Thu, Sep 15, 2016 at 5:34 PM, Bruno Bord [email protected]
wrote:

A few suggestions:

Since this is the first published translation of TBH in Portuguese, maybe
you can tag it as "1.0" version. When we'll merge it into master, it'll be
published. Further fixes may be marked as 1.1 or 1.0.1 if needed.

A few things are missing if we follow the CONTRIBUTING
https://github.com/brunobord/the-black-hack/blob/master/.github/CONTRIBUTING.md#when-you-add-a-translation
document. That'd be great if you could have these ones checked:

Eventually, when you're completely sure that you're ready to merge, you
may want to rebase and squash all these commits into one. This step is not
mandatory, it's just to have a cleaner history, with less commits and make
it more readable. If you can't or don't want to, don't worry, your PR will
still be accepted


You are receiving this because you modified the open/close state.
Reply to this email directly, view it on GitHub
#41 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AAkwn7IrBV-67ZiLgfnSARY_d_XG_v37ks5qqavagaJpZM4J8VBh
.


def test_slugify_converting_saves():
assert slugify('Converting Saves', '-') == 'converting-saves'
assert slugify('Conversion des jets de sauvegarde', '-') == 'conversion-des-jets-de-sauvegarde' # noqa
assert slugify('Convirtiendo tiradas de salvación', '-') == 'convirtiendo-tiradas-de-salvacion' # noqa
assert slugify('セーブの変換', '-') == 'sebunobian-huan'
assert slugify('Convertendo jogadas de proteção', '-') == 'convertendo-jogadas-de-protecao' # noqa
Copy link
Owner

Choose a reason for hiding this comment

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

Excellent!

#convertire-i-tiri-salvezza + p + table + table,
/* portuguese */
#convertendo-jogadas-de-protecao + p + table,
#convertendo-jogadas-de-protecao + p + table + table
Copy link
Owner

Choose a reason for hiding this comment

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

looking good. I'll double-check this when I'll try to build the HTML pages and browse the result.

@brunobord
Copy link
Owner

About version 1.0, you're talking about numbering the version in my fork with this number right?

I'm sorry, I think I confused you. Let me sum this up:

  • the website version is currently 2.2.0. By the website I mean either the original texts, the translations and all the toolkit I have written to build the HTML pages, the CSS stylesheets, etc. Whenever some significant changes are made, I'm upgrading the version for the website, but, for example, the French Translation is not upgraded to 2.2.0, neither the other ones.
  • Translators don't have to make a release. I, as a maintainer make a release of the whole thing, and make announcements, etc.
  • at the moment, there's no "Portuguese (Brazilian)" release of TBH, since this text is still on this branch, and not (yet) browsable on the SRD website.
  • as a consequence, your translation version could be 1.0, since it's the first time that it'll be published. So let's say that your 1.0 version of the Brazilian Portuguese translation is the latest commit of your fork. You've put a 1.0 version during your process, and then a 1.1. Who will know about this 1.1 version? nobody, because no-one will ever read it on the website, it's "hidden" in your branch.
  • if some day somebody fixes your translation, finds a typo, etc, it won't be the 1.0 no more and we may upgrade it. So somebody browsing the website will know that there has been some fixes and improvements on your text file since the last time she has read it. This "translation version number" will just reflect that this specific text has been updated and inform the reader about this.

@fermcg
Copy link
Contributor Author

fermcg commented Sep 16, 2016

Yes I guess I've messed things up in the pull request comments. Is there
any way to fix that history?

To make it clear about the version, are we talking about the meta.yaml file?
I've specified 1.2 there because it's based on TBH 1.2 (I've seen the
french version is 1.0).

If it's not the meta, should I use my Readme or write in the text files? (
the-black-hack.md / additional-things.md)

On Fri, Sep 16, 2016 at 9:33 AM, Bruno Bord [email protected]
wrote:

About version 1.0, you're talking about numbering the version in my fork
with this number right?

I'm sorry, I think I confused you. Let me sum this up:

  • the website version is currently 2.2.0. By the website I mean
    either the original texts, the translations and all the toolkit I have
    written to build the HTML pages, the CSS stylesheets, etc. Whenever some
    significant changes are made, I'm upgrading the version for the website,
    but, for example, the French Translation is not upgraded to 2.2.0, neither
    the other ones.
  • Translators don't have to make a release. I, as a maintainer make a
    release of the whole thing, and make announcements, etc.
  • at the moment, there's no "Portuguese (Brazilian)" release of TBH,
    since this text is still on this branch, and not (yet) browsable on the SRD
    website.
  • as a consequence, your translation version could be 1.0, since
    it's the first time that it'll be published. So let's say that your 1.0
    version of the Brazilian Portuguese translation is the latest commit
    of your fork. You've put a 1.0 version during your process, and then a 1.1.
    Who will know about this 1.1 version? nobody, because no-one will ever read
    it on the website, it's "hidden" in your branch.
  • if some day somebody fixes your translation, finds a typo, etc, it
    won't be the 1.0 no more and we may upgrade it. So somebody browsing the
    website will know that there has been some fixes and improvements on
    your text file
    since the last time she has read it. This "translation
    version number" will just reflect that this specific text has been
    updated and inform the reader about this.


You are receiving this because you modified the open/close state.
Reply to this email directly, view it on GitHub
#41 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AAkwn3_AafhWpqoxat_ftx67rzdMdQM3ks5qqoyagaJpZM4J8VBh
.

@brunobord
Copy link
Owner

Is there any way to fix that history?
To make it clear about the version, are we talking about the meta.yaml file?

Simply edit the meta.yaml file and put the right version, that'll be enough.

To make it clear about the version, are we talking about the meta.yaml file? I've specified 1.2 there because it's based on TBH 1.2 (I've seen the french version is 1.0).

Yes, TBH version used is 1.2, and it's written in your `brazilian-portuguese/the-black-hack.md``, so that's fine. The translation versions and the original text versions don't have to match.

@fermcg
Copy link
Contributor Author

fermcg commented Sep 16, 2016

Ok done!

On Fri, Sep 16, 2016 at 10:06 AM, Bruno Bord [email protected]
wrote:

Is there any way to fix that history?
To make it clear about the version, are we talking about the meta.yaml
file?

Simply edit the meta.yaml file and put the right version, that'll be
enough.

To make it clear about the version, are we talking about the meta.yaml
file? I've specified 1.2 there because it's based on TBH 1.2 (I've seen the
french version is 1.0).

Yes, TBH version used is 1.2, and it's written in your
brazilian-portuguese/the-black-hack.md`, so that's fine. The translation
versions and the original text versions don't have to match.


You are receiving this because you modified the open/close state.
Reply to this email directly, view it on GitHub
#41 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AAkwn5nQxSDPaeEg4nJ7jrwayBaxJ-fYks5qqpRNgaJpZM4J8VBh
.

@brunobord
Copy link
Owner

that's cool! thank you for your great work (and your patience with my nutty-nitpicks). Will merge tonight (CEST timezone)

Obrigado por tudo

@fermcg
Copy link
Contributor Author

fermcg commented Sep 16, 2016

thank you too for having this so well organized! the nutty-nitpicks are
part of the process! Looking forward for the merge!

Que le Hack se propager à travers le monde

On Fri, Sep 16, 2016 at 10:37 AM, Bruno Bord [email protected]
wrote:

that's cool! thank you for your great work (and your patience with my
nutty-nitpicks). Will merge tonight (CEST timezone)

Obrigado por tudo


You are receiving this because you modified the open/close state.
Reply to this email directly, view it on GitHub
#41 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AAkwn21x-9f4RKE5GfU-BHFH5V5pLBiqks5qqpumgaJpZM4J8VBh
.

@brunobord brunobord merged commit fdd7601 into brunobord:master Sep 16, 2016
@fermcg
Copy link
Contributor Author

fermcg commented Sep 16, 2016

\o/

On Fri, Sep 16, 2016 at 1:14 PM, Bruno Bord [email protected]
wrote:

Merged #41 #41.


You are receiving this because you modified the open/close state.
Reply to this email directly, view it on GitHub
#41 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AAkwn7OqYhMAfSPHLxcExjmBG05OOcKoks5qqsBwgaJpZM4J8VBh
.

@brunobord brunobord modified the milestone: Fall 2016 Jan 7, 2017
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.

2 participants