Skip to content

Commit f735ca1

Browse files
committed
updated docs
1 parent e54627b commit f735ca1

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Created by Oscar Otero <http://oscarotero.com> <oom@oscarotero.com> (MIT License
88

99
Gettext is a PHP (5.3) library to import/export/edit gettext from PO, MO, PHP, JS files, etc.
1010

11-
## v.2.0
11+
## v.3.0
1212

13-
The 2.0 version has some changes in the API. See the changelog for more information:
14-
https://github.com/oscarotero/Gettext/releases/tag/2.0
13+
The 3.0 version has some changes in the API. See the changelog for more information:
14+
https://github.com/oscarotero/Gettext/releases/tag/3.0
1515

1616

1717
## Usage example
@@ -235,6 +235,8 @@ The second argument of `mergeWith` defines how the merge will be done. You can p
235235
* MERGE_HEADERS: Merges the headers from translations2 to translations 1
236236
* MERGE_REFERENCES: Merges the references from translations2 to translations1
237237
* MERGE_COMMENTS: Merges the comments from translations2 to translations1
238+
* MERGE_LANGUAGE: Applies the language and plural forms of translations2 to translation1
239+
* MERGE_PLURAL: Translations with the same id but one with plurals and other singular will be merged into one singular
238240

239241
Example:
240242

@@ -254,7 +256,7 @@ $translations->mergeWith($poTranslations, Translations::MERGE_HEADERS | Translat
254256
Gettext\Generators\Po::generateFile($translations, 'locale.po');
255257
```
256258

257-
Note, if the second argument is not defined, the default is `self::MERGE_ADD | self::MERGE_HEADERS | self::MERGE_COMMENTS`
259+
Note, if the second argument is not defined, the default is `self::MERGE_ADD | self::MERGE_HEADERS | self::MERGE_COMMENTS | self::MERGE_REFERENCES | self::MERGE_PLURAL`
258260

259261

260262
## Contributors

0 commit comments

Comments
 (0)