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

Fix translate bug. Fix a warning #1240

Merged
merged 1 commit into from Aug 6, 2019
Merged

Fix translate bug. Fix a warning #1240

merged 1 commit into from Aug 6, 2019

Conversation

chrisju
Copy link

@chrisju chrisju commented Aug 6, 2019

fix 2 chinese translation errors

@chchwy
Copy link
Member

chchwy commented Aug 6, 2019

Thanks @chrisju

@chchwy chchwy merged commit 03f0ef0 into pencil2d:master Aug 6, 2019
}
break;
Copy link
Member

@scribblemaniac scribblemaniac Aug 6, 2019

Choose a reason for hiding this comment

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

No no no, this was right before. We intentionally want to create a new key in the duplicate mode if no previous key exists so it's as if it is duplicating the empty frames. Hence why there there are comments directly below this explaining that we want to fall through if the previous keyframe does not exist. @chchwy Please revert this.

Copy link
Member

@chchwy chchwy Aug 6, 2019

Choose a reason for hiding this comment

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

Sorry, my bad :(

Copy link
Member

@chchwy chchwy Aug 6, 2019

Choose a reason for hiding this comment

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

fixed.

Copy link
Member

@scribblemaniac scribblemaniac Aug 6, 2019

Choose a reason for hiding this comment

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

If we move the comments to right below the close bracket on line 909 and add a space to "fallthrough", it apparently will remove the warning on GCC. See https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wimplicit-fallthrough. Wouldn't be a bad idea to do this.

Copy link
Author

@chrisju chrisju Aug 6, 2019

Choose a reason for hiding this comment

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

Sorry, my reckless

@@ -1827,7 +1827,7 @@
<message>
<location filename="../app/ui/mainwindow2.ui" line="886"/>
<source>Move Frame Backward</source>
<translation>先后移动帧</translation>
<translation>向后移动帧</translation>
Copy link
Member

@scribblemaniac scribblemaniac Aug 6, 2019

Choose a reason for hiding this comment

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

Does changing the ts files work or does this need to be changed on Transifex? I was under the impression that it needed be changed on Transifex or it will just be overwritten next time the translations are pulled, but I am not fully familiar with that process.

Copy link
Member

@chchwy chchwy Aug 6, 2019

Choose a reason for hiding this comment

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

I need to upload this CN.ts file to transifex otherwise it will be overwritten next time as you said.

I will do that.

chchwy added a commit that referenced this pull request Aug 6, 2019
@scribblemaniac
Copy link
Member

scribblemaniac commented Aug 6, 2019

@chrisju Thanks for your contributions. While our code does produce a warning where you change the code, the placement of the break was intentional to have a certain behaviour. We will look into other options to remove the warning.

In case you are not aware, we use the Transifex translation platform to make it easier for people to translate and proofread our application. You can find our project here: https://www.transifex.com/pencil2d/pencil2d/ and apply for the Chinese team if you are interested in contributing further to the translations. We are grateful for any help you can provide.

@chchwy chchwy added this to the 0.6.5 milestone Nov 10, 2019
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.

None yet

3 participants