fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3150 from AdamNiederer/develop 

Docs: Lots of spelling fixes
This commit is contained in:
Luiza Pagliari 2017-03-13 06:54:33 -03:00 committed by GitHub
parent 5eadc715a6 cb8fe92df7
commit f91534d57a
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/api/editbar.md
View File

@ -1,5 +1,5 @@
# Editbar
srf/static/js/pad_editbar.js
src/static/js/pad_editbar.js
## isEnabled()
@ -25,4 +25,4 @@ toolbar.registerAceCommand("insertorderedlist", function (cmd, ace) {
Ties a `div.popup` where `id` equals `dropdown` to a `command` fired by clicking a button.
## triggerCommand(cmd[, item])
Triggers a command (optionally with some internal representation of the toolbar item that triggered it).
Triggers a command (optionally with some internal representation of the toolbar item that triggered it).

4
doc/api/editorInfo.md
View File

@ -69,9 +69,9 @@ This function replaces a range (from y1 to y2) with `newText`.
## editorInfo.ace_renumberList(lineNum)
If you delete a line, calling this method will fix the line numbering.
## editorInfo.ace_doReturnKey()
Forces a return key at the current carret position.
Forces a return key at the current caret position.
## editorInfo.ace_isBlockElement(element)
Returns true if your passed elment is registered as a block element
Returns true if your passed element is registered as a block element
## editorInfo.ace_getLineListType(lineNum)
Returns the line's html list type.
## editorInfo.ace_caretLine()

4
doc/api/hooks_server-side.md
View File

@ -72,7 +72,7 @@ Available blocks in `pad.html` are:
* `editbarMenuRight` - right tool bar
* `afterEditbar` - allows you to add stuff immediately after the toolbar
* `userlist` - the contents of the userlist dropdown
* `loading` - the intial loading message
* `loading` - the initial loading message
* `mySettings` - the left column of the settings dropdown ("My view"); intended for adding checkboxes only
* `mySettings.dropdowns` - add your dropdown settings here
* `globalSettings` - the right column of the settings dropdown ("Global view")
@ -104,7 +104,7 @@ Things in context:
Here you can add custom toolbar items that will be available in the toolbar config in `settings.json`. For more about the toolbar controller see the API section.
Usage examples:
Usage examples:
* [https://github.com/tiblu/ep_authorship_toggle]()

10
doc/database.md
View File

@ -6,7 +6,7 @@
A list of all existing groups (a JSON object with groupIDs as keys and `1` as values).
### pad:$PADID
Saves all informations about pads
Contains all information about pads
* **atext** - the latest attributed text
* **pool** - the attribute pool
@ -24,10 +24,10 @@ Saves a revision $REVNUM of pad $PADID
* **changeset** - the changeset of this revision
### pad:$PADID:chat:$CHATNUM
Saves a chatentry with num $CHATNUM of pad $PADID
Saves a chat entry with num $CHATNUM of pad $PADID
* **text** - the text of this chat entry
* **userId** - the autorID of this chat entry
* **userId** - the authorID of this chat entry
* **time** - the timestamp of this chat entry
### pad2readonly:$PADID
@ -43,9 +43,9 @@ Information about an author
* **colorID** - the colorID of this author as shown in the pad
### mapper2group:$MAPPER
Maps an external application identifier to an internal group
Maps an external application identifier to an internal group
### mapper2author:$MAPPER
Maps an external application identifier to an internal author
Maps an external application identifier to an internal author
### group:$GROUPID
a group of pads

4
doc/localization.md
View File

@ -31,7 +31,7 @@ Translations will be send back to us regularly and will eventually appear in the
Each translation consists of a key (the id of the string that is to be translated) and the translated string. Terms in curly braces must not be touched but left as they are, since they represent a dynamically changing part of the string like a variable. Imagine a message welcoming a user: `Welcome, {{userName}}!` would be translated as `Ahoy, {{userName}}!` in pirate.
### Client-side
We use a `language` cookie to save your language settings if you change them. If you don't, we autodetect your locale using information from your browser. Now, that we know your preferred language this information is feeded into a very nice library called [html10n.js](https://github.com/marcelklehr/html10n.js), which loads the appropriate translations and applies them to our templates, providing translation params, pluralization, include rules and even a nice javascript API along the way.
We use a `language` cookie to save your language settings if you change them. If you don't, we autodetect your locale using information from your browser. Then, the preferred language is fed into a library called [html10n.js](https://github.com/marcelklehr/html10n.js), which loads the appropriate translations and applies them to our templates. Its features include translation params, pluralization, include rules and a nice javascript API.
@ -79,7 +79,7 @@ alert(window._('pad.chat'));
}
```
Everytime the http server is started, it will auto-detect your messages and merge them automatically with the core messages.
Every time the http server is started, it will auto-detect your messages and merge them automatically with the core messages.
### Overwrite core messages