Merge branch '7.2.4' into stable

wgm · Dec 5, 2016 · 17c3531 · 17c3531
2 parents d65f9ac + 728f94b
commit 17c3531
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 27 deletions.
diff --git a/features/cerberusweb.core/api/dao/context_scheduled_behavior.php b/features/cerberusweb.core/api/dao/context_scheduled_behavior.php
@@ -463,7 +463,7 @@ static function _getFields() {
 			self::REPEAT_JSON => new DevblocksSearchField(self::REPEAT_JSON, 'context_scheduled_behavior', 'repeat_json', $translate->_('dao.context_scheduled_behavior.repeat_json'), null, false),
 
 			self::BEHAVIOR_NAME => new DevblocksSearchField(self::BEHAVIOR_NAME, 'trigger_event', 'title', $translate->_('common.name'), Model_CustomField::TYPE_SINGLE_LINE, true),
-			self::BEHAVIOR_VIRTUAL_ATTENDANT_ID => new DevblocksSearchField(self::BEHAVIOR_VIRTUAL_ATTENDANT_ID, 'trigger_event', 'virtual_attendant_id', $translate->_('common.virtual_attendant'), null, true),
+			self::BEHAVIOR_VIRTUAL_ATTENDANT_ID => new DevblocksSearchField(self::BEHAVIOR_VIRTUAL_ATTENDANT_ID, 'trigger_event', 'virtual_attendant_id', $translate->_('common.bot'), null, true),
 
 			self::VIRTUAL_TARGET => new DevblocksSearchField(self::VIRTUAL_TARGET, '*', 'target', $translate->_('common.target'), null, false),
 		);

diff --git a/features/cerberusweb.core/api/dao/trigger_event.php b/features/cerberusweb.core/api/dao/trigger_event.php
@@ -519,7 +519,7 @@ static function _getFields() {
 			self::TITLE => new DevblocksSearchField(self::TITLE, 'trigger_event', 'title', $translate->_('common.title'), null, true),
 			self::IS_DISABLED => new DevblocksSearchField(self::IS_DISABLED, 'trigger_event', 'is_disabled', $translate->_('dao.trigger_event.is_disabled'), null, true),
 			self::IS_PRIVATE => new DevblocksSearchField(self::IS_PRIVATE, 'trigger_event', 'is_private', $translate->_('dao.trigger_event.is_private'), null, true),
-			self::VIRTUAL_ATTENDANT_ID => new DevblocksSearchField(self::VIRTUAL_ATTENDANT_ID, 'trigger_event', 'virtual_attendant_id', $translate->_('common.virtual_attendant'), null, true),
+			self::VIRTUAL_ATTENDANT_ID => new DevblocksSearchField(self::VIRTUAL_ATTENDANT_ID, 'trigger_event', 'virtual_attendant_id', $translate->_('common.bot'), null, true),
 			self::EVENT_POINT => new DevblocksSearchField(self::EVENT_POINT, 'trigger_event', 'event_point', $translate->_('common.event'), null, true),
 		);
 

diff --git a/features/cerberusweb.core/strings.xml b/features/cerberusweb.core/strings.xml
@@ -1558,14 +1558,14 @@
 				<seg>Record URL</seg>
 			</tuv>
 		</tu>
-		<tu tuid="common.virtual_attendant">
+		<tu tuid="common.bot">
 			<tuv xml:lang="en_US">
-				<seg>Virtual Attendant</seg>
+				<seg>bot</seg>
 			</tuv>
 		</tu>
-		<tu tuid="common.virtual_attendants">
+		<tu tuid="common.bots">
 			<tuv xml:lang="en_US">
-				<seg>Virtual Attendants</seg>
+				<seg>bots</seg>
 			</tuv>
 		</tu>
 		<tu tuid="common.watch">

diff --git a/features/cerberusweb.core/templates/border.tpl b/features/cerberusweb.core/templates/border.tpl
@@ -38,7 +38,7 @@
 				<li><a href="{devblocks_url}c=profiles&w=worker&me=me&tab=availability{/devblocks_url}">{'common.availability'|devblocks_translate|lower}</a></li>
 				{if DAO_Skill::count()}<li><a href="{devblocks_url}c=profiles&w=worker&me=me&tab=skills{/devblocks_url}">{'common.skills'|devblocks_translate|lower}</a></li>{/if}
 				<li><a href="{devblocks_url}c=profiles&w=worker&me=me&tab=activity{/devblocks_url}">{'common.activity_log'|devblocks_translate|lower}</a></li>
-				<li><a href="{devblocks_url}c=profiles&w=worker&me=me&tab=attendants{/devblocks_url}">{'common.virtual_attendants'|devblocks_translate|lower}</a></li>
+				<li><a href="{devblocks_url}c=profiles&w=worker&me=me&tab=attendants{/devblocks_url}">{'common.bots'|devblocks_translate|lower}</a></li>
 				<li><a href="{devblocks_url}c=profiles&w=worker&me=me&tab=links{/devblocks_url}">{'watchlist'|devblocks_translate|lower}</a></li>
 				<li><a href="{devblocks_url}c=profiles&w=worker&me=me&tab=snippets{/devblocks_url}">{'common.snippets'|devblocks_translate|lower}</a></li>
 				<li><a href="{devblocks_url}c=login&a=signout{/devblocks_url}">{'header.signoff'|devblocks_translate|lower}</a></li>

diff --git a/features/cerberusweb.core/templates/configuration/index.tpl b/features/cerberusweb.core/templates/configuration/index.tpl
@@ -97,9 +97,9 @@
 		</li>
 		<li>
 			<div>
-				<a href="javascript:;" class="menu">{'common.virtual_attendants'|devblocks_translate|capitalize} <span class="glyphicons glyphicons-chevron-down" style="color:white;"></span></a>
+				<a href="javascript:;" class="menu">{'common.bots'|devblocks_translate|capitalize} <span class="glyphicons glyphicons-chevron-down" style="color:white;"></span></a>
 				<ul class="cerb-popupmenu cerb-float">
-					<li><a href="{devblocks_url}c=config&a=attendants{/devblocks_url}">{'common.search'|devblocks_translate|capitalize}</a></li>
+					<li><a href="{devblocks_url}c=config&a=bots{/devblocks_url}">{'common.search'|devblocks_translate|capitalize}</a></li>
 					<li><a href="{devblocks_url}c=config&a=scheduled_behavior{/devblocks_url}">Scheduled Behavior</a></li>
 
 					{$exts = Extension_PageMenuItem::getExtensions(true, 'core.page.configuration','core.setup.menu.va')}

diff --git a/features/cerberusweb.core/templates/internal/calendar/peek.tpl b/features/cerberusweb.core/templates/internal/calendar/peek.tpl
@@ -38,7 +38,7 @@
 				{/if}
 
 				{if $model->owner_context==CerberusContexts::CONTEXT_VIRTUAL_ATTENDANT && isset($virtual_attendants.{$model->owner_context_id})}
-				<b>{$virtual_attendants.{$model->owner_context_id}->name}</b> ({'common.virtual_attendant'|devblocks_translate|capitalize})
+				<b>{$virtual_attendants.{$model->owner_context_id}->name}</b> ({'common.bot'|devblocks_translate|capitalize})
 				{/if}
 
 				{if $model->owner_context==CerberusContexts::CONTEXT_APPLICATION}
@@ -79,7 +79,7 @@
 
 				{foreach from=$virtual_attendants item=va key=va_id}
 					{if $va->isWriteableByActor($active_worker)}
-					<option value="v_{$va_id}" {if $model->owner_context==CerberusContexts::CONTEXT_VIRTUAL_ATTENDANT && $va_id==$model->owner_context_id}selected="selected"{/if}>{'common.virtual_attendant'|devblocks_translate|capitalize}: {$va->name}</option>
+					<option value="v_{$va_id}" {if $model->owner_context==CerberusContexts::CONTEXT_VIRTUAL_ATTENDANT && $va_id==$model->owner_context_id}selected="selected"{/if}>{'common.bot'|devblocks_translate|capitalize}: {$va->name}</option>
 					{/if}
 				{/foreach}
 			</select>

diff --git a/features/cerberusweb.core/templates/internal/custom_fieldsets/peek.tpl b/features/cerberusweb.core/templates/internal/custom_fieldsets/peek.tpl
@@ -84,7 +84,7 @@
 
 					{foreach from=$virtual_attendants item=va key=va_id}
 						{if $va->isWriteableByActor($active_worker)}
-						<option value="v_{$va_id}" {if $custom_fieldset->owner_context==CerberusContexts::CONTEXT_VIRTUAL_ATTENDANT && $va_id==$custom_fieldset->owner_context_id}selected="selected"{/if}>{'common.virtual_attendant'|devblocks_translate|capitalize}: {$va->name}</option>
+						<option value="v_{$va_id}" {if $custom_fieldset->owner_context==CerberusContexts::CONTEXT_VIRTUAL_ATTENDANT && $va_id==$custom_fieldset->owner_context_id}selected="selected"{/if}>{'common.bot'|devblocks_translate|capitalize}: {$va->name}</option>
 						{/if}
 					{/foreach}
 				</select>
@@ -107,7 +107,7 @@
 					{/if}
 
 					{if $custom_fieldset->owner_context==CerberusContexts::CONTEXT_VIRTUAL_ATTENDANT && isset($virtual_attendants.{$custom_fieldset->owner_context_id})}
-					<b>{$virtual_attendants.{$custom_fieldset->owner_context_id}->name}</b> ({'common.virtual_attendant'|devblocks_translate|capitalize})
+					<b>{$virtual_attendants.{$custom_fieldset->owner_context_id}->name}</b> ({'common.bot'|devblocks_translate|capitalize})
 					{/if}
 
 					{if $custom_fieldset->owner_context==CerberusContexts::CONTEXT_APPLICATION}

diff --git a/features/cerberusweb.core/templates/internal/macros/display/button.tpl b/features/cerberusweb.core/templates/internal/macros/display/button.tpl
@@ -1,5 +1,5 @@
 {if !empty($macros)}
-<button type="button" class="split-left" onclick="$(this).next('button').click();" title="{'common.virtual_attendants'|devblocks_translate|capitalize}{if $pref_keyboard_shortcuts} (M){/if}"><img src="{devblocks_url}c=avatars&context=app&id=0{/devblocks_url}" style="width:22px;height:22px;margin:-3px 0px 0px 2px;"></button><!--  
+<button type="button" class="split-left" onclick="$(this).next('button').click();" title="{'common.bots'|devblocks_translate|capitalize}{if $pref_keyboard_shortcuts} (M){/if}"><img src="{devblocks_url}c=avatars&context=app&id=0{/devblocks_url}" style="width:22px;height:22px;margin:-3px 0px 0px 2px;"></button><!--  
 --><button type="button" class="split-right" id="btnDisplayMacros"><span class="glyphicons glyphicons-chevron-down" style="font-size:12px;color:white;"></span></button>
 <ul class="cerb-popupmenu cerb-float" id="menuDisplayMacros">
 	<li style="background:none;">

diff --git a/features/cerberusweb.core/templates/profiles/worker.tpl b/features/cerberusweb.core/templates/profiles/worker.tpl
@@ -133,7 +133,7 @@
 
 		{if $active_worker->is_superuser || $worker->id == $active_worker->id}
 		{$tabs[] = 'attendants'}
-		<li data-alias="attendants"><a href="{devblocks_url}ajax.php?c=internal&a=showAttendantsTab&point={$point}&context={$page_context}&context_id={$page_context_id}{/devblocks_url}">{'common.virtual_attendants'|devblocks_translate|capitalize}</a></li>
+		<li data-alias="attendants"><a href="{devblocks_url}ajax.php?c=internal&a=showAttendantsTab&point={$point}&context={$page_context}&context_id={$page_context_id}{/devblocks_url}">{'common.bots'|devblocks_translate|capitalize}</a></li>
 		{/if}
 
 		{if $active_worker->is_superuser || $worker->id == $active_worker->id}

diff --git a/install/extras/translations/cerb_lang_de_DE.xml b/install/extras/translations/cerb_lang_de_DE.xml
@@ -1708,12 +1708,12 @@
 				<seg/>
 			</tuv>
 		</tu>
-		<tu tuid="common.virtual_attendant">
+		<tu tuid="common.bot">
 			<tuv xml:lang="de_DE">
 				<seg/>
 			</tuv>
 		</tu>
-		<tu tuid="common.virtual_attendants">
+		<tu tuid="common.bots">
 			<tuv xml:lang="de_DE">
 				<seg/>
 			</tuv>

diff --git a/install/extras/translations/cerb_lang_es_ES.xml b/install/extras/translations/cerb_lang_es_ES.xml
@@ -1703,12 +1703,12 @@
 				<seg/>
 			</tuv>
 		</tu>
-		<tu tuid="common.virtual_attendant">
+		<tu tuid="common.bot">
 			<tuv xml:lang="es_ES">
 				<seg/>
 			</tuv>
 		</tu>
-		<tu tuid="common.virtual_attendants">
+		<tu tuid="common.bots">
 			<tuv xml:lang="es_ES">
 				<seg/>
 			</tuv>

diff --git a/install/extras/translations/cerb_lang_it_IT.xml b/install/extras/translations/cerb_lang_it_IT.xml
@@ -1703,12 +1703,12 @@
 				<seg/>
 			</tuv>
 		</tu>
-		<tu tuid="common.virtual_attendant">
+		<tu tuid="common.bot">
 			<tuv xml:lang="it_IT">
 				<seg/>
 			</tuv>
 		</tu>
-		<tu tuid="common.virtual_attendants">
+		<tu tuid="common.bots">
 			<tuv xml:lang="it_IT">
 				<seg/>
 			</tuv>

diff --git a/install/extras/translations/cerb_lang_nl_NL.xml b/install/extras/translations/cerb_lang_nl_NL.xml
@@ -1703,12 +1703,12 @@
 				<seg/>
 			</tuv>
 		</tu>
-		<tu tuid="common.virtual_attendant">
+		<tu tuid="common.bot">
 			<tuv xml:lang="nl_NL">
 				<seg/>
 			</tuv>
 		</tu>
-		<tu tuid="common.virtual_attendants">
+		<tu tuid="common.bots">
 			<tuv xml:lang="nl_NL">
 				<seg/>
 			</tuv>

diff --git a/install/extras/translations/cerb_lang_pt_PT.xml b/install/extras/translations/cerb_lang_pt_PT.xml
@@ -1703,12 +1703,12 @@
 				<seg>Registar URL</seg>
 			</tuv>
 		</tu>
-		<tu tuid="common.virtual_attendant">
+		<tu tuid="common.bot">
 			<tuv xml:lang="pt_PT">
 				<seg/>
 			</tuv>
 		</tu>
-		<tu tuid="common.virtual_attendants">
+		<tu tuid="common.bots">
 			<tuv xml:lang="pt_PT">
 				<seg/>
 			</tuv>

diff --git a/install/extras/translations/cerb_lang_ru_RU.xml b/install/extras/translations/cerb_lang_ru_RU.xml
@@ -1703,12 +1703,12 @@
 				<seg>URL записи</seg>
 			</tuv>
 		</tu>
-		<tu tuid="common.virtual_attendant">
+		<tu tuid="common.bot">
 			<tuv xml:lang="ru_RU">
 				<seg/>
 			</tuv>
 		</tu>
-		<tu tuid="common.virtual_attendants">
+		<tu tuid="common.bots">
 			<tuv xml:lang="ru_RU">
 				<seg/>
 			</tuv>