addand improve mandarin name for some popular brand #907

rtsisyk · 2021-07-22T21:44:50Z

MASangys commented

2021-07-22 21:44:50 +00:00

(Migrated from github.com)

No description provided.

biodranik (Migrated from github.com) reviewed 2021-07-23 06:43:51 +00:00

					
				@ -41,2 +41,3 @@

				    zh = 藍瓶咖啡

				    zh-Hans = 蓝瓶咖啡

				    zh-Hant = 藍瓶咖啡

biodranik (Migrated from github.com) commented

2021-07-23 06:43:51 +00:00

zh-Hans version should also be added if you remove a generic zh translation.

`zh-Hans` version should also be added if you remove a generic `zh` translation.

biodranik commented

2021-07-23 06:44:45 +00:00

(Migrated from github.com)

Please also sign the commit for DCO.

rtsisyk reviewed 2021-07-23 09:28:17 +00:00

data/strings/brands_strings.txt

					
				@ -38,7 +38,8 @@

				    en = Blue Bottle Coffee

rtsisyk commented

2021-07-23 09:28:16 +00:00

As far as I can see, translations were generated from OSM. I can't find script to regenerate this file in repo, probably it never was committed or this work was done manually.

It would be better implement a simple script to regeneraye this file from OSM source id you have cycles. Or please synchronize OSM and this file manually in your PR. Otherwise all manuals changes in PR will be nulled in the future.

As far as I can see, translations were generated from OSM. I can't find script to regenerate this file in repo, probably it never was committed or this work was done manually. It would be better implement a simple script to regeneraye this file from OSM source id you have cycles. Or please synchronize OSM and this file manually in your PR. Otherwise all manuals changes in PR will be nulled in the future.

MASangys (Migrated from github.com) reviewed 2021-07-23 09:45:18 +00:00

data/strings/brands_strings.txt

					
				@ -41,2 +41,3 @@

				    zh = 藍瓶咖啡

				    zh-Hans = 蓝瓶咖啡

				    zh-Hant = 藍瓶咖啡

MASangys (Migrated from github.com) commented

2021-07-23 09:45:17 +00:00

add already

MASangys (Migrated from github.com) reviewed 2021-07-23 09:46:41 +00:00

data/strings/brands_strings.txt

					
				@ -38,7 +38,8 @@

				    en = Blue Bottle Coffee

MASangys (Migrated from github.com) commented

2021-07-23 09:46:40 +00:00

I do hope that all brands can be inputed directly from NSI with translation for other language from wikidata, will be a much easire environment to do

rtsisyk reviewed 2021-07-24 13:49:32 +00:00

data/strings/brands_strings.txt

					
				@ -38,7 +38,8 @@

				    en = Blue Bottle Coffee

rtsisyk commented

2021-07-24 13:49:31 +00:00

I checked some brands and they matched wikidata translation. I am OK because re-generation from Wikidata and/or OSM should procude the same or closer result.

rtsisyk approved these changes 2021-07-24 13:50:51 +00:00

rtsisyk left a comment

Please add Signed-off-by.

https://github.com/organicmaps/organicmaps/blob/master/docs/DCO.md#what-is-a-dco

git commit amend -s

Please add Signed-off-by. https://github.com/organicmaps/organicmaps/blob/master/docs/DCO.md#what-is-a-dco git commit amend -s

MASangys commented

2021-07-24 14:02:08 +00:00

(Migrated from github.com)

Please add Signed-off-by.

https://github.com/organicmaps/organicmaps/blob/master/docs/DCO.md#what-is-a-dco

git commit amend -s

$ git commit -s -m 'An example commit message'
like this?

> Please add Signed-off-by. > > https://github.com/organicmaps/organicmaps/blob/master/docs/DCO.md#what-is-a-dco > > git commit amend -s $ git commit -s -m 'An example commit message' like this?

rtsisyk commented

2021-07-24 15:06:57 +00:00

@MASangys

Run git commit amend -s. This command will launch editor to change the last commit message.
Add/change Signed-off-by: Your Full Name <contact@email>

@MASangys 1. Run `git commit amend -s`. This command will launch editor to change the last commit message. 2. Add/change `Signed-off-by: Your Full Name <contact@email>`

MASangys commented

2021-07-24 15:25:16 +00:00

(Migrated from github.com)

@MASangys

Run git commit amend -s. This command will launch editor to change the last commit message.

Add/change Signed-off-by: Your Full Name <contact@email>

Where can I run? I clicked action and run the script, but it displayed gitt... will be ignored since log searching is not yet available

> @MASangys > > 1. Run `git commit amend -s`. This command will launch editor to change the last commit message. > 2. Add/change `Signed-off-by: Your Full Name <contact@email>` Where can I run? I clicked action and run the script, but it displayed gitt... will be ignored since log searching is not yet available

rtsisyk commented

2021-07-24 15:31:37 +00:00

Do you have a CLI?

MASangys commented

2021-07-24 15:36:01 +00:00

(Migrated from github.com)