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

Create ru.js #5649

Closed
wants to merge 2 commits into from
Closed

Create ru.js #5649

wants to merge 2 commits into from

Conversation

zaharovrd
Copy link
Contributor

add russian lang

artf and others added 2 commits July 4, 2023 16:53
* Add autoFormat option to CodeMirrorEditor

* Add optsCodeViewer

* Remove unused options

* Use createViewer in ExportTemplate

* Up ExportTemplate

* Cleanup

* Up panel/index to TS

* Refactor Panels TS GrapesJS#5144

* Cleanup

* Up panels test

* Fix `usePlugin is not a function`. Closes GrapesJS#5167

* Move css_composer/index to TS

* Up css_composer tests

* Up tests

* Add `addStyles` option to `editor.Css.setRule`. Closes GrapesJS#5173

* Update setRule JSDoc

* Fix PropertyStack in bundled dts file. Closes GrapesJS#5154

* Fixed broken link in README.md (GrapesJS#5188)

Update README.md

added ".com" in a not functioning link.

* Refactor Traits Collection (GrapesJS#4983)

* Refactor Traits Collection

* Fix css prefix

* Fix trait undo and add test for it

---------

Co-authored-by: Artur Arseniev <artur.catch@hotmail.it>

* Update keymaps add jsdoc

* Improve typings (GrapesJS#5192)

* add component:resize to ComponentEvent type

* limit storageManager type to be 'local' | 'remote' | undefined

* add type to components parameter

* Use LiteralUnion in storage_manager config

* Up editor TS

* Improve components TS

* Update ComponentModelDefinition

* [Docs] Update Broken Links for (Component Types, and Commands) (GrapesJS#5196)

update links

* Don't remove styles with avoidInlineStyle GrapesJS#4503

* Up block_manager

* Up device_manager

* Up pages TS

* Add PageProperties

* Update PageManager TS

* Export Sector/s in TS

* Up style_manager TS

* Up Property TS

* Up TS

* Up TS

* Up canvas class

* Fix SwitchVisibility

* Store custom selector manager container

* Refactor OpenStyleManager

* Up OpenStyleManager

* Up OpenStyleManager

* Up selector_manager

* Add custom option to trait_manager

* Up trait model

* Up OpenTraitManager for custom traits

* Up

* Handle properly Component model `defaults` as functions. Closes GrapesJS#5199

* Fix PropertyFactory tests

* Up RTE doc

* Update rich_text_editor.md (GrapesJS#5201)

The previous code snippet encountered a syntax error when attempting to use it in my application. To ensure its usability for others, I have made necessary updates to resolve the syntax error and enable successful execution. These modifications aim to provide a code snippet that can be easily utilized by anyone without encountering any syntax-related issues.

* Build

* Up docs

---------

Co-authored-by: pfaffmann <48207288+pfaffmann@users.noreply.github.com>
Co-authored-by: Alex Ritter <ritt.alex@gmail.com>
Co-authored-by: Julia Alberici <julia.jpa0@gmail.com>
Co-authored-by: Abdelrhman Said <70618755+AbdelrhmanSaid@users.noreply.github.com>
Co-authored-by: Ai Anshu <68537640+gxanshu@users.noreply.github.com>
add russian lang
emptyState: '- Состояние -',
states: {
hover: 'Наведение',
active: 'Клик',

Choose a reason for hiding this comment

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

Нажатие

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Да, можно и нажатие....

// }
},
traitManager: {
empty: 'Выберите элемент перед использованием Trait Manager',

Choose a reason for hiding this comment

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

Менеджер характеристик?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Я подумал, что это имя собственное, а их обычно не переводят.

@artf artf changed the base branch from master to dev February 12, 2024 05:19
@artf artf changed the base branch from dev to master February 12, 2024 05:20
@artf
Copy link
Member

artf commented Feb 12, 2024

Thanks @zaharovrd I'd like to merge but can you please submit the PR from/to dev branch and not master (unfortunately changing the base now it doesn't work as it looks like you created the branch from master)

@zaharovrd
Copy link
Contributor Author

zaharovrd commented Feb 12, 2024

Thanks @zaharovrd I'd like to merge but can you please submit the PR from/to dev branch and not master (unfortunately changing the base now it doesn't work as it looks like you created the branch from master)

What's the best way to do this?

I did it according to the instructions from the documentation - it says what to do from master

I changed it - please check. is everything correct?

@zaharovrd zaharovrd changed the base branch from master to dev February 12, 2024 06:18
@artf
Copy link
Member

artf commented Feb 12, 2024

I changed it - please check. is everything correct?

You should be able to see how you have a lot of unreasonable conflicts, that is because you created a branch from master.

I did it according to the instructions from the documentation - it says what to do from master

Not really, look carefully at points 3 and 7.

  1. Start a new branch from dev
  1. Once you've done, you can create a new Pull Request on GitHub from your branch to dev...

What's the best way to do this?

Just create a new branch from dev, add your file and push a new PR to dev (you can close this one).

@artf
Copy link
Member

artf commented Feb 13, 2024

Merged #5678

@artf artf closed this Feb 13, 2024
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