IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed "enroll" labels.

Browse Source 
Labels using the word "enroll" (except for host enrollment) have
been modified to use more relevant words.

The IPA.add_dialog has been renamed into IPA.entity_adder_dialog
for clarity.

Ticket #1642
This commit is contained in:
Endi S. Dewata 2011-10-24 19:20:14 -05:00
parent 4322370942
commit 6af5755de5
11 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install/ui/add.js
View File

@ -23,7 +23,7 @@
/* REQUIRES: ipa.js */
IPA.add_dialog = function (spec) {
IPA.entity_adder_dialog = function(spec) {
spec = spec || {};
@ -192,7 +192,7 @@ IPA.add_dialog = function (spec) {
};
// methods that should be invoked by subclasses
that.add_dialog_create = that.create;
that.entity_adder_dialog_create = that.create;
init();

6
install/ui/association.js
View File

@ -889,7 +889,7 @@ IPA.association_facet = function (spec) {
that.add_button = IPA.action_button({
name: 'add',
label: IPA.messages.buttons.enroll,
label: IPA.messages.buttons.add,
icon: 'add-icon',
click: function() {
if (!that.add_button.hasClass('action-button-disabled')) {
@ -923,7 +923,7 @@ IPA.association_facet = function (spec) {
}).appendTo(span);
$('<label/>', {
text: IPA.messages.association.direct_enrollment,
text: IPA.messages.association.direct_membership,
'for': direct_id
}).appendTo(span);
@ -944,7 +944,7 @@ IPA.association_facet = function (spec) {
}).appendTo(span);
$('<label/>', {
text: IPA.messages.association.indirect_enrollment,
text: IPA.messages.association.indirect_membership,
'for': indirect_id
}).appendTo(span);
}

4
install/ui/automount.js
View File

@ -221,10 +221,10 @@ IPA.automount_key_column = function(spec) {
IPA.automountmap_adder_dialog = function(spec) {
var that = IPA.add_dialog(spec);
var that = IPA.entity_adder_dialog(spec);
that.create = function() {
that.add_dialog_create();
that.entity_adder_dialog_create();
var method_field = that.get_field('method');
var indirect_section = that.get_section('indirect');

2
install/ui/dialog.js
View File

@ -492,7 +492,7 @@ IPA.adder_dialog = function(spec) {
var add_button = that.create_button({
name: 'add',
label: IPA.messages.buttons.enroll,
label: IPA.messages.buttons.add,
click: function() {
if (!add_button.is_enabled()) return;
that.execute();

4
install/ui/dns.js
View File

@ -383,10 +383,10 @@ IPA.dnszone_adder_dialog = function(spec) {
spec = spec || {};
var that = IPA.add_dialog(spec);
var that = IPA.entity_adder_dialog(spec);
that.create = function() {
that.add_dialog_create();
that.entity_adder_dialog_create();
that.container.addClass('dnszone-adder-dialog');
};

2
install/ui/entity.js
View File

@ -914,7 +914,7 @@ IPA.entity_builder = function(){
};
that.adder_dialog = function(spec) {
spec.factory = spec.factory || IPA.add_dialog;
spec.factory = spec.factory || IPA.entity_adder_dialog;
spec.name = spec.name || 'add';
if (!spec.title) {

2
install/ui/group.js
View File

@ -140,7 +140,7 @@ IPA.group_adder_dialog = function (spec) {
spec = spec || {};
var that = IPA.add_dialog(spec);
var that = IPA.entity_adder_dialog(spec);
var init = function() {

4
install/ui/host.js
View File

@ -267,10 +267,10 @@ IPA.host_adder_dialog = function(spec) {
spec = spec || {};
spec.retry = typeof spec.retry !== 'undefined' ? spec.retry : false;
var that = IPA.add_dialog(spec);
var that = IPA.entity_adder_dialog(spec);
that.create = function() {
that.add_dialog_create();
that.entity_adder_dialog_create();
that.container.addClass('host-adder-dialog');
};

6
install/ui/service.js
View File

@ -79,18 +79,18 @@ IPA.entity_factories.service = function() {
}).
standard_association_facets().
adder_dialog({
factory: IPA.service_add_dialog,
factory: IPA.service_adder_dialog,
height: 350
}).
build();
};
IPA.service_add_dialog = function(spec) {
IPA.service_adder_dialog = function(spec) {
spec = spec || {};
var that = IPA.add_dialog(spec).
var that = IPA.entity_adder_dialog(spec).
field(IPA.widget({
name: 'krbprincipalname',
required: false,

9
install/ui/test/data/ipa_init.json
View File

@ -24,8 +24,8 @@
"memberof": "Add ${entity} ${primary_key} into ${other_entity}",
"sourcehost": "Add Source ${other_entity} into ${entity} ${primary_key}"
},
"direct_enrollment": "Direct Enrollment",
"indirect_enrollment": "Indirect Enrollment",
"direct_membership": "Direct Membership",
"indirect_membership": "Indirect Membership",
"no_entries": "No entries.",
"paging": "Showing ${start} to ${end} of ${total} entries.",
"remove": {
@ -48,7 +48,6 @@
"add_many": "Add Many",
"cancel": "Cancel",
"close": "Close",
"enroll": "Enroll",
"find": "Find",
"get": "Get",
"issue": "Issue",
@ -98,8 +97,8 @@
},
"facet_groups": {
"managedby": "${primary_key} is managed by:",
"member": "Entities enrolled in ${primary_key}:",
"memberof": "${primary_key} is a member of these:"
"member": "${primary_key} members:",
"memberof": "${primary_key} is a member of:"
},
"facets": {
"details": "Settings",

9
ipalib/plugins/internal.py
View File

@ -114,8 +114,8 @@ class i18n_messages(Command):
"memberof": _("Add ${entity} ${primary_key} into ${other_entity}"),
"sourcehost": _("Add Source ${other_entity} into ${entity} ${primary_key}"),
},
"direct_enrollment": _("Direct Enrollment"),
"indirect_enrollment": _("Indirect Enrollment"),
"direct_membership": _("Direct Membership"),
"indirect_membership": _("Indirect Membership"),
"no_entries": _("No entries."),
"paging": _("Showing ${start} to ${end} of ${total} entries."),
"remove": {
@ -138,7 +138,6 @@ class i18n_messages(Command):
"add_many": _("Add Many"),
"cancel": _("Cancel"),
"close": _("Close"),
"enroll": _("Enroll"),
"find": _("Find"),
"get": _("Get"),
"issue": _("Issue"),
@ -188,8 +187,8 @@ class i18n_messages(Command):
},
"facet_groups": {
"managedby": _("${primary_key} is managed by:"),
"member": _("Entities enrolled in ${primary_key}:"),
"memberof": _("${primary_key} is a member of these:"),
"member": _("${primary_key} members:"),
"memberof": _("${primary_key} is a member of:"),
},
"facets": {
"details": _("Settings"),