From 6b410aa9a0436af7b228720e0f8a3bf2ab2eb99d Mon Sep 17 00:00:00 2001 From: Stephen Shkardoon Date: Thu, 29 May 2014 13:13:45 +1200 Subject: [PATCH 1/3] Update i18n.md Fix a link being inside backticks, which broke the formatting. --- docs/en/topics/i18n.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/topics/i18n.md b/docs/en/topics/i18n.md index 6b0dd9604..f1718fb16 100644 --- a/docs/en/topics/i18n.md +++ b/docs/en/topics/i18n.md @@ -204,7 +204,7 @@ You'll need to install PHPUnit to run the text collector (see [testing-guide](/t ## Language definitions Each module can have one language table per locale, stored by convention in the `lang/` subfolder. -The translation is powered by `[Zend_Translate](http://framework.zend.com/manual/en/zend.translate.html)`, +The translation is powered by [Zend_Translate](http://framework.zend.com/manual/en/zend.translate.html), which supports different translation adapters, dealing with different storage formats. By default, SilverStripe 3.x uses a YAML format (through the [Zend_Translate_RailsYAML adapter](https://github.com/chillu/zend_translate_railsyaml)). From 0da889bde20572daad924647e3e5733047e9d5d9 Mon Sep 17 00:00:00 2001 From: Stevie Mayhew Date: Thu, 29 May 2014 16:25:40 +1200 Subject: [PATCH 2/3] Update datamodel.md Fix broken link to SS_List->column --- docs/en/topics/datamodel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/topics/datamodel.md b/docs/en/topics/datamodel.md index 38a444efa..5fe36d3fa 100755 --- a/docs/en/topics/datamodel.md +++ b/docs/en/topics/datamodel.md @@ -615,7 +615,7 @@ This functionality is provided by the `SS_Map` class, which can be used to build $map = new SS_Map($members, 'ID', 'FirstName'); Note: You can also retrieve a single property from all contained records -through `[api:SS_List->column()]`. +through [SS_List->column()](api:SS_List#_column). ## Data Handling From 32c202836888fc7c1d2d54db82a5b8f43f6e376a Mon Sep 17 00:00:00 2001 From: tscole Date: Mon, 23 Jun 2014 14:52:08 +0100 Subject: [PATCH 3/3] Update i18n.php Norwegian should use 'nb' and not 'no' in common languages array --- i18n/i18n.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/i18n.php b/i18n/i18n.php index ff4d4daa4..3d861e6e0 100644 --- a/i18n/i18n.php +++ b/i18n/i18n.php @@ -692,7 +692,7 @@ class i18n extends Object implements TemplateGlobalProvider { 'mt' => array('Maltese', 'Malti'), 'mr' => array('Marathi', 'मराठी'), 'ne' => array('Nepali', 'नेपाली'), - 'no' => array('Norwegian', 'Norsk'), + 'nb' => array('Norwegian', 'Norsk'), 'om' => array('Oromo', 'Afaan Oromo'), 'fa' => array('Persian', 'فارسى'), 'pl' => array('Polish', 'polski'),