Bugzilla – Attachment 53370 Details for
Bug 16687
Translatability: Fix issues with sentence splitting in Administration preferences
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SGINED-OFF] Bug 16687 - Translatability: Fix issues in Administration preferences
SGINED-OFF-Bug-16687---Translatability-Fix-issues-.patch (text/plain), 14.52 KB, created by
Owen Leonard
on 2016-07-13 13:05:04 UTC
(
hide
)
Description:
[SGINED-OFF] Bug 16687 - Translatability: Fix issues in Administration preferences
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2016-07-13 13:05:04 UTC
Size:
14.52 KB
patch
obsolete
>From cdac29505eb6157a54f375405e6bba7198fb9753 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch> >Date: Tue, 7 Jun 2016 17:29:22 +0200 >Subject: [PATCH] [SGINED-OFF] Bug 16687 - Translatability: Fix issues in > Administration preferences >Content-Type: text/plain; charset="utf-8" > >This patch fixes sentence splitting and other translation issues in >file koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref >to avoid odd translations. > >To test: >- Without patch, open Home > Administration > System preferences > and go to tab 'Administration" >- Apply patch >- Open the same page in a new window and compare the text: > - Verify that no sentences are splitted > - Verify that the text changes do not introduce misunderstandings > and have the same meaning as without patch > >Amended for comment #7 2016-07-12/mv > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >--- > .../prog/en/modules/admin/preferences/admin.pref | 173 ++++++++++----------- > 1 file changed, 80 insertions(+), 93 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref >index 03e23ac..f691cde 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref >@@ -2,38 +2,36 @@ Administration: > # Only used internally, omitted: FrameworksLoaded, Version > Interface options: > - >- - Use >+ - "Email address for the administrator of Koha: " > - pref: KohaAdminEmailAddress > class: email >- - "as the email address for the administrator of Koha. (This is the default From: address for emails unless there is one for the particular library, and is referred to when an internal error occurs.)" >+ - "(This is the default From: address for emails unless there is one for the particular library, and is referred to when an internal error occurs.)" > - >- - Use >- - pref: ReplytoDefault >- class: email >- - "as the email address that will be set as the replyto in emails" >+ - "Email address to be set as the replyto in emails: " >+ - pref: ReplytoDefault >+ class: email > - >- - Use >- - pref: ReturnpathDefault >- class: email >- - "as the return path or bounce address for undeliverable mail messages. If you leave this empty, the From address will be used (often defaulting to the admin address)." >+ - "Return path or bounce address for undeliverable mail messages: " >+ - pref: ReturnpathDefault >+ class: email >+ - "If you leave this empty, the From address will be used (often defaulting to the admin address)." > - >- - Show >+ - "How much debugging information to show in the browser when an internal error occurs: " > - pref: DebugLevel > default: 0 > choices: >- 0: "no" >- 1: some >- 2: lots of >- - debugging information in the browser when an internal error occurs. >+ 0: None >+ 1: Some >+ 2: All > - >+ - "Show itemtype icons in the catalog: " > - pref: noItemTypeImages > default: 0 > choices: >- yes: "Don't show" >- no: Show >- - itemtype icons in the catalog. >+ yes: "No" >+ no: "Yes" > - >- - Separate columns in an exported CSV file with >+ - "Default separator for columns in an exported CSV file: " > - pref: delimiter > default: "," > choices: >@@ -43,159 +41,150 @@ Administration: > '/': slashes > '\': backslashes > '#': "#'s" >- - by default. > - >+ - "Allow staff and patrons to create and view saved lists of books: " > - pref: virtualshelves > choices: >- yes: Allow >- no: "Don't allow" >- - staff and patrons to create and view saved lists of books. >+ yes: "Yes" >+ no: "No" > - >- - When editing circulation rules show the >+ - "Default view when editing circulation rules: " > - pref: DefaultToLoggedInLibraryCircRules > choices: >- yes: "logged in library's" >- no: "all libraries" >- - rules by default. >+ yes: "The logged-in library" >+ no: "All libraries" > - >- - When editing notices and slips show the >+ - "Default view when editing notices and slips: " > - pref: DefaultToLoggedInLibraryNoticesSlips > choices: >- yes: "logged in library's" >- no: "all libraries" >- - notices and slips by default. >+ yes: "The logged-in library" >+ no: "All libraries" > - >- - When editing overdue notice/status triggers show the >+ - "Default view when editing overdue notice/status triggers: " > - pref: DefaultToLoggedInLibraryOverdueTriggers > choices: >- yes: "logged in library's" >- no: "all libraries" >- - rules by default. >+ yes: "The logged-in library" >+ no: "All libraries" > Login options: > - >- - Automatically log out users after >+ - "Inactivity timeout in seconds to automatically log out users: " > - pref: timeout > class: integer >- - seconds of inactivity. Adding d will specify it in days, e.g. 1d is timeout of one day. >+ - Adding d will specify it in days, e.g. 1d is timeout of one day. > - >+ - "Require staff to log in from a computer in the IP address range specified by their library (if any): " > - pref: AutoLocation > default: 0 > choices: >- yes: Require >- no: "Don't require" >- - staff to log in from a computer in the IP address range <a href="/cgi-bin/koha/admin/branches.pl">specified by their library</a> (if any). >+ yes: "Yes" >+ no: "No" >+ - <a href="/cgi-bin/koha/admin/branches.pl">Link to library administration</a> > - >+ - "Enable check for change in remote IP address for session security: " > - pref: SessionRestrictionByIP > default: 1 > choices: >- yes: Enable >- no: "Disable" >- - check for change in remote IP address for session security. Disable only when remote IP address changes frequently. >+ yes: "Yes" >+ no: "No" >+ - (Disable only when remote IP address changes frequently.) > # PostgreSQL is supported by CGI::Session but not by Koha. > - >- - Store login session information >+ - "Storage of login session information: " > - pref: SessionStorage > default: mysql > choices: >- mysql: in the MySQL database. >- Pg: in the PostgreSQL database (not supported). >- tmp: as temporary files. >- memcached: in a memcached server. >+ mysql: MySQL database >+ Pg: PostgreSQL database (not supported) >+ tmp: Temporary files >+ memcached: Memcached server > - >+ - "Prevent staff (but not superlibrarians) from modifying objects (holds, items, patrons, etc.) belonging to other libraries: " > - pref: IndependentBranches > default: 0 > choices: >- yes: Prevent >- no: "Don't prevent" >- - staff (but not superlibrarians) from modifying objects (holds, items, patrons, etc.) belonging to other libraries. >+ yes: "Yes" >+ no: "No" > - >+ - Prevent staff (but not superlibrarians) from viewing and approving/denying patron modification requests for patrons belonging to other libraries. > - pref: IndependentBranchesPatronModifications > default: 0 > choices: >- yes: Prevent >- no: "Don't prevent" >- - staff (but not superlibrarians) from viewing and approving/denying patron modification requests for patrons belonging to other libraries. >+ yes: "Yes" >+ no: "No" > CAS authentication: > - >+ - "Use CAS for login authentication: " > - pref: casAuthentication > default: 0 > choices: >- yes: Use >- no: "Don't use" >- - CAS for login authentication. >+ yes: "Yes" >+ no: "No" > - >+ - "Logout of CAS when logging out of Koha: " > - pref: casLogout > default: 0 > choices: >- yes: Logout >- no: "Don't Logout" >- - of CAS when logging out of Koha. >+ yes: "Yes" >+ no: "No" > - >- - The CAS Authentication Server can be found at >+ - "URL of the CAS Authentication Server: " > - pref: casServerUrl > SSL client certificate authentication: > - >- - Use >+ - "Field to use for SSL client certificate authentication: " > - pref: AllowPKIAuth > default: None > choices: >- None: "no" >- Common Name: the Common Name >- emailAddress: the emailAddress >- - field for SSL client certificate authentication >+ None: "None" >+ Common Name: Common Name >+ emailAddress: emailAddress > Google OpenID Connect: > - >+ - "Use Google OpenID Connect login: " > - pref: GoogleOpenIDConnect > choices: >- yes: Use >- no: "Don't Use" >- - Google OpenID Connect login. >+ yes: "Yes" >+ no: "No" > - You will need to select OAuth2 when creating an app in the google cloud console, and set the web origin to your_opac_url and the redirect url to your_opac_url/cgi-bin/koha/svc/auth/googleopenidconnect . > - >- - Google OAuth2 Client ID >+ - "Google OAuth2 Client ID: " > - pref: GoogleOAuth2ClientID > - >- - Google OAuth2 Client Secret >+ - "Google OAuth2 Client Secret: " > - pref: GoogleOAuth2ClientSecret > - >- - Google OpenID Connect Restrict to domain (or subdomain of this domain) >+ - "Google OpenID Connect Restrict to domain (or subdomain of this domain): " > - pref: GoogleOpenIDConnectDomain >- - . Leave blank for all google domains >+ - Leave blank for all google domains > Mozilla Persona: > - >+ - "Allow Mozilla persona for login: " > - pref: Persona > default: 0 > choices: >- yes: Allow >- no: "Don't Allow" >- - Mozilla persona for login >+ yes: "Yes" >+ no: "No" > Share anonymous usage statistics: > - >+ - "Share anonymous Koha usage data with the Koha community: " > - pref: UsageStats > default: 0 > choices: >- yes: Share >- no: "Don't share" >- - anonymous Koha usage data with the Koha community. You can see the data on the <a href="http://hea.koha-community.org">Hea Koha community website</a>. You have to run misc/cronjobs/share_usage_with_koha_community.pl in a cronjob. >+ yes: "Yes" >+ no: "No" >+ - "You have to run misc/cronjobs/share_usage_with_koha_community.pl in a cronjob. Note that the other \"UsageStats\" preferences have no effect if this preference is set to \"No\". Website where usage statistics are published: <a href=\"http://hea.koha-community.org\">Hea Koha community website</a>." > - >- - The library name >+ - "Use the following library name to be shown on the Hea Community website: " > - pref: UsageStatsLibraryName >- - will be shown on the <a href="http://hea.koha-community.org">Hea Koha community website</a>. > - If this field is empty data will be sent anonymously. >- - Note that this value has no effect if the UsageStats system preference is set to "Don't share" > - >- - "The country where your library is located:" >+ - "The country where your library is located to be shown on the Hea Community website: " > - pref: UsageStatsCountry >- - This will be shown on the <a href="http://hea.koha-community.org">Hea Koha community website</a>. >- - Note that this value has no effect if the UsageStats system preference is set to "Don't share" > - >- - The library URL >+ - "The library URL to be shown on the Hea Community website: " > - pref: UsageStatsLibraryUrl >- - will be shown on the <a href="http://hea.koha-community.org">Hea Koha community website</a>. >- - Note that this value has no effect if the UsageStats system preference is set to "Don't share" >- > - >- - The library type >+ - "The library type to be shown on the Hea Community website: " > - pref: UsageStatsLibraryType > default: public > choices: >@@ -209,13 +198,11 @@ Administration: > government: "government" > religiousOrg: "religious organization" > subscription: "subscription" >- - will be shown on the <a href="http://hea.koha-community.org">Hea Koha community website</a>. >- - Note that this value has no effect if the UsageStats system preference is set to "Don't share" > Search Engine: > - >+ - "Use following search engine: " > - pref: SearchEngine > default: Zebra > choices: > Zebra: Zebra > Elasticsearch: Elasticsearch >- - is the search engine used. >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 16687
:
52156
|
52946
|
53335
|
53370
|
55788
|
55887
|
56525
|
56569
|
56615