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

Updated English strings #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

pmwoodward3
Copy link

I found and fixed some issues in the english translation.

Commit Message Guidelines

Header
Blank Line
Body
Blank Line
Footer

The header should look like:
<type>(<scope>): <subject>

The body should have any necessary detailed info about the commit:
An example, references as to where this idea came from, etc.

The footer should have all the issues tagged:
Fixes #123, Fixes #456

So a commit should look like:
feat(users): Add new Yahoo authentication

Yahoo authentication idea proposed by @codydaig
Example implementation in file.js

Fixes #82
  • Types:
    • feat - Features, Enhancements, and overall Improvements
    • fix - Fixes, Bugs, HotFixs, etc...
    • doc - Changes to the Documentation and doesn't actually touch any code.
  • Scope:
    • The scope should be where the change took place.
    • Examples: users, core, config, articles
  • Subject:
    • The subject line should be clear and concise as to what is being accomplished in the commit.
  • General Rules:
    • No Line in the Commit message can be longer than 80 characters.
  • Reference: Angular Conventions

I found and fixed some issues in the english translation.
@taobataoma
Copy link
Owner

@pmwoodward3 glad to see you, and in trans-string-en.js, the Sing out, Sing in, Sign up is origin from mean.js, and all route, controller method, api name are used these string, so i don't want to change it, but other trans all are very well, then how can i accept the Pull Request with out the Sign ** string?

@taobataoma
Copy link
Owner

@pmwoodward3 I will try to use Commit Message Guidelines next commit, ;)

@Shadowghost
Copy link

@taobataoma is this still problematic to merge? I don't understand, why it should be a problem to change the english strings (the string vars aren't changed), when chinese does not use the english strings at all (and obviously still works). Should we rebase this commit on latest master and resubmit it?
If the problem is still the same, can you make a list of non-translatable strings?

Copy link
Contributor

@deed02392 deed02392 left a comment

Choose a reason for hiding this comment

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

Mostly good, definitely an improvement.

@katoxi katoxi closed this May 23, 2019
@deed02392
Copy link
Contributor

Why did you close this @katoxi ?

@katoxi
Copy link
Collaborator

katoxi commented Jun 14, 2019

Why did you close this @katoxi ?

Cause i [May 23, 2019] base on you PU update the file...
1735d9a
7c218d8
If the new update or old translate still have translate problem or can improve it...
I will help taobataoma update or merge it...

Sorry again that i closed you PU, now reopen this PU.

@katoxi katoxi reopened this Jun 14, 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.

5 participants