-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into release/0.5.0
- Loading branch information
Showing
18 changed files
with
607 additions
and
247 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,6 @@ | ||
| /build | ||
| assets/data.go | ||
|
|
||
| # Mac | ||
| .DS_Store | ||
| #VSCode | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| // assets in locale and templates folders are converted into Go source code with go-bindata | ||
| // the data.go file in this package is auto generated through the generate-dev and generate-prod tasks in the Makefile | ||
| package assets |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| #------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ||
| # Notes | ||
| # - Documentation: https://github.com/nicksnyder/go-i18n/blob/master/README.md | ||
| # - Description should be the English version of the text, unless English version is a shorthand e.g. Home button is shorthand in English for Homepage | ||
| # - Arguments can be added via {{.argN}} where N is integer index starting at 0 e.g. {{.arg0}} {{.arg1}} | ||
| # - To inject HTML (Avoid where possible as it is messy) use "| safeHTML" e.g. {{ localise Foo .Language 1 | safeHTML }} where Foo might be "<strong>test</strong>" | ||
| # count - 0 = zero | ||
| # count - 1 = one | ||
| # count - 2 = two; useful for languages with mutations like welsh (radical) 'brother'=brawd, two (soft) 'brothers'=frawd, three or more (nasal) 'brothers'=brodyr | ||
| # count - 3 = few | ||
| # count - 6 = many | ||
| # count - 4 = other; 4,5 & >6 | ||
| # Plural rules can be found here: http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html | ||
| #------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ||
|
|
||
| [FeedbackTitle] | ||
| description = "{{.Metadata.Title}}" | ||
| one = "{{.arg0}}" | ||
|
|
||
| [FeedbackDesc] | ||
| descriptions = "You can use the form below to ask a question, report a problem or suggest an improvement we can make to ONS.GOV.UK" | ||
| one = "You can use the form below to ask a question, report a problem or suggest an improvement to the ONS.GOV.UK team." | ||
|
|
||
| [FeedbackTitleWhat] | ||
| description = "What's it to do with?" | ||
| one = "What's it to do with?" | ||
|
|
||
| [FeedbackWhatOptSpecificPage] | ||
| description = "This specific page" | ||
| one = "This specific page" | ||
|
|
||
| [FeedbackWhatEnterURL] | ||
| description = "Enter URL or name of the page" | ||
| one = "Enter URL or name of the page" | ||
|
|
||
| [FeedbackWhatOptHintSpecificPage] | ||
| description = "{{.ServiceDescription}}" | ||
| one = "({{.arg0}})" | ||
|
|
||
| [FeedbackWhatOptNewService] | ||
| description = "This new service" | ||
| one = "This new service" | ||
|
|
||
| [FeedbackWhatOptGeneral] | ||
| description = "The whole <abbr title=\"Office for National Statistics\">ONS</abbr> website or general feedback" | ||
| one = "The whole ONS website or general feedback" | ||
|
|
||
| [FeedbackTitleEntry] | ||
| description = "What are the details?" | ||
| one = "What are the details?" | ||
|
|
||
| [FeedbackHintEntry] | ||
| description = "For example, if you were searching for something, what did you type into the search box?" | ||
| one = "For example, if you were searching for something, what did you type into the search box?" | ||
|
|
||
| [FeedbackAlertEntry] | ||
| description = "Write some feedback" | ||
| one = "Write some feedback" | ||
|
|
||
| [FeedbackTitleReply] | ||
| description = "Do you want a reply?" | ||
| one = "Do you want a reply?" | ||
|
|
||
| [FeedbackDescReply] | ||
| description = "If you'd like us to get back to you, please add your name and email address below." | ||
| one = "If you'd like us to get back to you, please add your name and email address below." | ||
|
|
||
| [FeedbackTitleName] | ||
| description = "Name (optional)" | ||
| one = "Name (optional)" | ||
|
|
||
| [FeedbackTitleEmail] | ||
| description = "Email (optional)" | ||
| one = "Email (optional)" | ||
|
|
||
| [FeedbackReplyDisclaimer] | ||
| description = "We'll only use this to reply to your message" | ||
| one = "We'll only use this to reply to your message." | ||
|
|
||
| [FeedbackAlertEmail] | ||
| description = "This is not a valid email address, correct it or delete it" | ||
| one = "This is not a valid email address, correct it or delete it" | ||
|
|
||
| [FeedbackSubmit] | ||
| description = "Send feedback" | ||
| one = "Send feedback" | ||
|
|
||
| [FeedbackFinished] | ||
| description = "Your feedback will help us to improve the website. We are unable to respond to all enquiries. If your matter is urgent, please <a href=\"/aboutus/contactus\">contact us</a>.<br><br>Return to <a href=\"{{.Metadata.Description}}\">{{.Metadata.Description}}" | ||
| one = "Your feedback will help us to improve the website. We are unable to respond to all enquiries. If your matter is urgent, please <a href=\"/aboutus/contactus\">contact us</a>.<br><br>Return to <a href=\"{{.arg0}}\">{{.arg0}}" | ||
|
|
||
| [FeedbackWholeWebsite] | ||
| description = "The whole ONS website or general feedback" | ||
| one = "The whole ONS website or general feedback" | ||
|
|
||
| [FeedbackASpecificPage] | ||
| description = "A specific page" | ||
| one = "A specific page" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| #------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ||
| # Notes | ||
| # - Documentation: https://github.com/nicksnyder/go-i18n/blob/master/README.md | ||
| # - Description should be the English version of the text, unless English version is a shorthand e.g. Home button is shorthand in English for Homepage | ||
| # - Arguments can be added via {{.argN}} where N is integer index starting at 0 e.g. {{.arg0}} {{.arg1}} | ||
| # - To inject HTML (Avoid where possible as it is messy) use "| safeHTML" e.g. {{ localise Foo .Language 1 | safeHTML }} where Foo might be "<strong>test</strong>" | ||
| # count - 0 = zero | ||
| # count - 1 = one | ||
| # count - 2 = two; useful for languages with mutations like welsh (radical) 'brother'=brawd, two (soft) 'brothers'=frawd, three or more (nasal) 'brothers'=brodyr | ||
| # count - 3 = few | ||
| # count - 6 = many | ||
| # count - 4 = other; 4,5 & >6 | ||
| # Plural rules can be found here: http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html | ||
| #------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ||
|
|
||
| [FeedbackTitle] | ||
| description = "{{.Metadata.Title}}" | ||
| one = "{{.arg0}}" | ||
|
|
||
| [FeedbackDesc] | ||
| descriptions = "You can use the form below to ask a question, report a problem or suggest an improvement we can make to ONS.GOV.UK" | ||
| one = "You can use the form below to ask a question, report a problem or suggest an improvement to the ONS.GOV.UK team." | ||
|
|
||
| [FeedbackTitleWhat] | ||
| description = "What's it to do with?" | ||
| one = "What's it to do with?" | ||
|
|
||
| [FeedbackWhatOptSpecificPage] | ||
| description = "This specific page" | ||
| one = "This specific page" | ||
|
|
||
| [FeedbackWhatEnterURL] | ||
| description = "Enter URL or name of the page" | ||
| one = "Enter URL or name of the page" | ||
|
|
||
| [FeedbackWhatOptHintSpecificPage] | ||
| description = "{{.ServiceDescription}}" | ||
| one = "({{.arg0}})" | ||
|
|
||
| [FeedbackWhatOptNewService] | ||
| description = "This new service" | ||
| one = "This new service" | ||
|
|
||
| [FeedbackWhatOptGeneral] | ||
| description = "The whole <abbr title=\"Office for National Statistics\">ONS</abbr> website or general feedback" | ||
| one = "The whole ONS website or general feedback" | ||
|
|
||
| [FeedbackTitleEntry] | ||
| description = "What are the details?" | ||
| one = "What are the details?" | ||
|
|
||
| [FeedbackHintEntry] | ||
| description = "For example, if you were searching for something, what did you type into the search box?" | ||
| one = "For example, if you were searching for something, what did you type into the search box?" | ||
|
|
||
| [FeedbackAlertEntry] | ||
| description = "Write some feedback" | ||
| one = "Write some feedback" | ||
|
|
||
| [FeedbackTitleReply] | ||
| description = "Do you want a reply?" | ||
| one = "Do you want a reply?" | ||
|
|
||
| [FeedbackDescReply] | ||
| description = "If you'd like us to get back to you, please add your name and email address below." | ||
| one = "If you'd like us to get back to you, please add your name and email address below." | ||
|
|
||
| [FeedbackTitleName] | ||
| description = "Name (optional)" | ||
| one = "Name (optional)" | ||
|
|
||
| [FeedbackTitleEmail] | ||
| description = "Email (optional)" | ||
| one = "Email (optional)" | ||
|
|
||
| [FeedbackReplyDisclaimer] | ||
| description = "We'll only use this to reply to your message" | ||
| one = "We'll only use this to reply to your message." | ||
|
|
||
| [FeedbackAlertEmail] | ||
| description = "This is not a valid email address, correct it or delete it" | ||
| one = "This is not a valid email address, correct it or delete it" | ||
|
|
||
| [FeedbackSubmit] | ||
| description = "Send feedback" | ||
| one = "Send feedback" | ||
|
|
||
| [FeedbackFinished] | ||
| description = "Your feedback will help us to improve the website. We are unable to respond to all enquiries. If your matter is urgent, please <a href=\"/aboutus/contactus\">contact us</a>.<br><br>Return to <a href=\"{{.Metadata.Description}}\">{{.Metadata.Description}}" | ||
| one = "Your feedback will help us to improve the website. We are unable to respond to all enquiries. If your matter is urgent, please <a href=\"/aboutus/contactus\">contact us</a>.<br><br>Return to <a href=\"{{.arg0}}\">{{.arg0}}" | ||
|
|
||
| [FeedbackWholeWebsite] | ||
| description = "The whole ONS website or general feedback" | ||
| one = "The whole ONS website or general feedback" | ||
|
|
||
| [FeedbackASpecificPage] | ||
| description = "A specific page" | ||
| one = "A specific page" |
Oops, something went wrong.