(De)Capitalized strings to fit the common/usual format, corrected spelling, removed unnecessary characters.

This commit is contained in:
Jonas Thelemann
2017-04-05 13:50:49 +01:00
committed by Dave Page
parent 65f21a8cd7
commit 37120bf199
22 changed files with 44 additions and 44 deletions

View File

@@ -425,7 +425,7 @@ class CollationView(PGChildNodeView):
status=410,
success=0,
errormsg=gettext(
"Incomplete definition. Please provide Locale OR Copy Collation OR LC_TYPE/LC_COLLATE"
"Incomplete definition. Please provide locale OR copy collation OR LC_TYPE/LC_COLLATE!"
)
)

View File

@@ -163,7 +163,7 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
copy_coll_flag = true;
}
if (locale_flag && (lc_coll_flag || lc_coll_flag) && copy_coll_flag) {
msg = '{{ _('Incomplete definition, Please provide Locale OR Copy collation OR LC_TYPE/LC_COLLATE!') }}';
msg = '{{ _('Incomplete definition. Please provide locale OR copy collation OR LC_TYPE/LC_COLLATE!') }}';
err['locale'] = msg
}
return null;

View File

@@ -415,7 +415,7 @@ class FtsConfigurationView(PGChildNodeView):
status=410,
success=0,
errormsg=_(
"provide atleast copy config or parser"
"Provide at least copy config or parser."
)
)

View File

@@ -60,7 +60,7 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
dialogHelp: '{{ url_for('help.static', filename='fts_dictionary_dialog.html') }}',
canDrop: true,
canDropCascade: true,
label: '{{ _('FTS dictionary') }}',
label: '{{ _('FTS Dictionary') }}',
hasSQL: true,
hasDepends: true,
Init: function() {

View File

@@ -458,7 +458,7 @@ class FtsTemplateView(PGChildNodeView):
return make_json_response(
success=1,
info=gettext("FTS template dropped"),
info=gettext("FTS Template dropped"),
data={
'id': tid,
'sid': sid,
@@ -650,7 +650,7 @@ class FtsTemplateView(PGChildNodeView):
if not status:
return internal_server_error(
gettext(
"Could not generate reversed engineered query for the FTS template.\n{0}").format(
"Could not generate reversed engineered query for the FTS Template.\n{0}").format(
res
)
)
@@ -658,7 +658,7 @@ class FtsTemplateView(PGChildNodeView):
if res is None:
return gone(
gettext(
"Could not generate reversed engineered query for FTS template node.")
"Could not generate reversed engineered query for FTS Template node.")
)
return ajax_response(response=res)

View File

@@ -357,7 +357,7 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
}
if (_.isUndefined(this.get('prorettypename')) || String(this.get('prorettypename')).replace(/^\s+|\s+$/g, '') == '') {
err['prorettypename'] = '{{ _('Return Type cannot be empty.') }}';
err['prorettypename'] = '{{ _('Return type cannot be empty.') }}';
errmsg = errmsg || err['prorettypename'];
}

View File

@@ -278,7 +278,7 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
}
if (_.isUndefined(this.get('prorettypename')) || String(this.get('prorettypename')).replace(/^\s+|\s+$/g, '') == '') {
err['prorettypename'] = '{{ _('Return Type cannot be empty.') }}';
err['prorettypename'] = '{{ _('Return type cannot be empty.') }}';
errmsg = errmsg || err['prorettypename'];
}

View File

@@ -611,7 +611,7 @@ class CheckConstraintView(PGChildNodeView):
return make_json_response(
success=1,
info=_("Check Constraint dropped"),
info=_("Check Constraint dropped."),
data={
'id': tid,
'scid': scid,

View File

@@ -932,7 +932,7 @@ class TypeView(PGChildNodeView, DataTypeReader):
status=410,
success=0,
errormsg=gettext(
'External types require both Input and Output conversion functions.'
'External types require both input and output conversion functions.'
)
)

View File

@@ -407,7 +407,7 @@ function($, _, S, pgAdmin, pgBrowser, alertify, Backgrid) {
return m.get('typtype') === 'r';
}, deps: ['typtype'], label: '',
schema:[{
id: 'typname', label:'{{ _('Sub-type') }}', cell: 'string',
id: 'typname', label:'{{ _('Subtype') }}', cell: 'string',
control: 'node-ajax-options',
select2: { allowClear: true, placeholder: "", width: "100%" },
url: 'get_stypes', type: 'text', mode: ['properties', 'create', 'edit'],
@@ -417,7 +417,7 @@ function($, _, S, pgAdmin, pgBrowser, alertify, Backgrid) {
return d;
}
},{
id: 'opcname', label:'{{ _('Sub-type operator class') }}', cell: 'string',
id: 'opcname', label:'{{ _('Subtype operator class') }}', cell: 'string',
mode: ['properties', 'create', 'edit'], group: '{{ _('Range Type') }}',
disabled: 'inSchemaWithModelCheck', deps: ['typname'],
control: 'select', options: function() {
@@ -517,7 +517,7 @@ function($, _, S, pgAdmin, pgBrowser, alertify, Backgrid) {
return result;
}
},{
id: 'rngsubdiff', label:'{{ _('Sub-type diff function') }}', cell: 'string',
id: 'rngsubdiff', label:'{{ _('Subtype diff function') }}', cell: 'string',
type: 'text', mode: ['properties', 'create', 'edit'],
group: '{{ _('Range Type') }}',
disabled: 'inSchemaWithModelCheck', deps: ['opcname'],

View File

@@ -504,7 +504,7 @@ SELECT EXISTS(
return internal_server_error(errormsg=res)
return success_return(
message=_("Updated the next-runtime to now!")
message=_("Updated the next runtime to now.")
)
@check_precondition

View File

@@ -71,7 +71,7 @@ function($, _, S, pgAdmin, moment, pgBrowser, Alertify, Backform) {
render: function() {
this.$el.empty();
var model = this.model;
this.$el.text(this.formatter.fromRaw(model.get(this.column.get("name")), model) || '{{ _('<Any>') }}');
this.$el.text(this.formatter.fromRaw(model.get(this.column.get("name")), model) || '{{ _('<any>') }}');
this.delegateEvents();
return this;

View File

@@ -161,7 +161,7 @@ class RoleView(PGChildNodeView):
if u'rolmembership' in data:
if u'rid' not in kwargs or kwargs['rid'] == -1:
msg = _("""
Role membership information must be passed as an array of JSON object in the
Role membership information must be passed as an array of JSON objects in the
following format:
rolmembership:[{
@@ -186,8 +186,8 @@ rolmembership:[{
data[u'members'].append(r[u'role'])
else:
msg = _("""
Role membership information must be passed a string representing an array of
JSON object in the following format:
Role membership information must be passed as a string representing an array of
JSON objects in the following format:
rolmembership:{
'added': [{
role: [rolename],
@@ -264,7 +264,7 @@ rolmembership:{
if u'seclabels' in data:
if u'rid' not in kwargs or kwargs['rid'] == -1:
msg = _("""
Security Label must be passed as an array of JSON object in the following
Security Label must be passed as an array of JSON objects in the following
format:
seclabels:[{
provider: <provider>,
@@ -281,7 +281,7 @@ seclabels:[{
return precondition_required(msg)
else:
msg = _("""
Security Label must be passed as an array of JSON object in the following
Security Label must be passed as an array of JSON objects in the following
format:
seclabels:{
'added': [{
@@ -342,8 +342,8 @@ seclabels:{
if u'variables' in data:
if u'rid' not in kwargs or kwargs['rid'] == -1:
msg = _("""
Configuration parameters/variables must be passed as an array of JSON object in
the following format (create mode):
Configuration parameters/variables must be passed as an array of JSON objects in
the following format in create mode:
variables:[{
database: <database> or null,
name: <configuration>,
@@ -361,8 +361,8 @@ variables:[{
return precondition_required(msg)
else:
msg = _("""
Configuration parameters/variables must be passed as an array of JSON object in
the following format (update mode):
Configuration parameters/variables must be passed as an array of JSON objects in
the following format in update mode:
rolmembership:{
'added': [{
database: <database> or null,
@@ -699,14 +699,14 @@ rolmembership:{
if not status:
return internal_server_error(
_("Could not generate reversed engineered Query for the role.\n{0}").format(
_("Could not generate reversed engineered query for the role.\n{0}").format(
res
)
)
if res is None:
return gone(
_("Could not generate reversed engineered Query for the role.")
_("Could not generate reversed engineered query for the role.")
)
return ajax_response(response=res.strip('\n'))

View File

@@ -663,7 +663,7 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
id: 'db', label:'{{ _('Maintenance database') }}', type: 'text', group: "{{ 'Connection' }}",
mode: ['properties', 'edit', 'create'], disabled: 'isConnected'
},{
id: 'username', label:'{{ _('User name') }}', type: 'text', group: "{{ 'Connection' }}",
id: 'username', label:'{{ _('Username') }}', type: 'text', group: "{{ 'Connection' }}",
mode: ['properties', 'edit', 'create'], disabled: 'isConnected'
},{
id: 'password', label:'{{ _('Password') }}', type: 'password',