Merge branch 'master' of https://github.com/2600hz/monster-ui-voip

Conflicts:
	submodules/groups/groups.js
	submodules/users/users.js

submodules/groups/groups.js

@@ -995,6 +995,7 @@ define(function(require){
 							monster.pub('common.numbers.getListFeatures', function(features) {
 								_.each(numbers, function(number, k) {
 									number.viewFeatures = $.extend(true, {}, features);
+									number.phoneNumber = number.id;
 
 									var rowTemplate = monster.template(self, 'groups-numbersItemRow', { number: number });
 
@@ -1271,7 +1272,6 @@ define(function(require){
 					unassignedNumbers: {}
 				};
 
-
 			monster.pub('common.numbers.getListFeatures', function(features) {
 				_.each(data.numbers.numbers, function(number, id) {
 					/* Formating number */

submodules/myOffice/myOffice.js

@@ -532,7 +532,7 @@ define(function(require){
 						break;
 					case "numbers":
 						$('.category#numbers').addClass('active');
-						monster.pub('voip.numbers.render', parent);
+						monster.pub('voip.numbers.render', { parent: parent });
 						break;
 					case "strategy":
 						$('.category#strategy').addClass('active');

submodules/users/users.js

@@ -1032,6 +1032,7 @@ define(function(require){
 							monster.pub('common.numbers.getListFeatures', function(features) {
 								_.each(numbers, function(number, k) {
 									number.viewFeatures = $.extend(true, {}, features);
+									number.phoneNumber = number.id;
 
 									var rowTemplate = monster.template(self, 'users-numbersItemRow', { number: number });
 

views/groups-numbers.html

@@ -54,7 +54,7 @@
 
 	<div class="actions">
 		<a href="#" class="spare-link monster-link pull-left{{#if emptySpare}} disabled{{/if}}">
-			<i class="icon-plus icon-green icon-large"></i>Add from Spare Numbers
+			<i class="icon-plus icon-green icon-large"></i>{{ i18n.groups.addFromSpare }}
 		</a>
 		<ul class="nav pull-left">
 			<li class="dropdown">

views/groups-numbersItemRow.html

@@ -1,4 +1,4 @@
-<div class="item-row" data-id="{{number.phoneNumber}}" data-search="{{formatPhoneNumber number.phoneNumber}} {{number.phoneNumber}} {{number.locality.city}} {{number.locality.country}}">
+<div class="item-row" data-id="{{number.phoneNumber}}">
 	<div class="features-block pull-right">
 		<div class="edit-features">
 			<div class="navbar">

views/users-name.html

@@ -67,9 +67,12 @@
 			<div class="row-fields">
             	<div class="icon-wrapper" data-original-title="{{i18n.users.editionForm.languageHelp}}" data-placement="top" data-toggle="tooltip"><i class="icon-flag"></i></div>
 				<select id="user_language" name="extra.language">
-					<option value="auto">{{i18n.languages.auto}}</option>
-					<option value="en-US"{{#compare language '===' 'en-US'}} selected{{/compare}}>{{i18n.languages.americanEnglish}}</option>
-					<option value="fr-FR"{{#compare language '===' 'fr-FR'}} selected{{/compare}}>{{i18n.languages.frenchFrench}}</option>
+					{{#select language}}
+						<option value="auto">{{i18n.languages.auto}}</option>
+						<option value="en-US">{{i18n.languages.americanEnglish}}</option>
+						<option value="fr-FR">{{i18n.languages.frenchFrench}}</option>
+						<option value="ru-RU">{{i18n.languages.russianRussian}}</option>
+					{{/select}}
 				</select>
 			</div>
 

views/users-numbers.html

@@ -54,7 +54,7 @@
 
 	<div class="actions">
 		<a href="#" class="spare-link monster-link pull-left{{#if emptySpare}} disabled{{/if}}">
-			<i class="icon-plus icon-green icon-large"></i>Add from Spare Numbers
+			<i class="icon-plus icon-green icon-large"></i>{{ i18n.users.addFromSpare }}
 		</a>
 		<ul class="nav pull-left">
 			<li class="dropdown">

views/users-numbersItemRow.html

@@ -1,4 +1,4 @@
-<div class="item-row" data-id="{{number.phoneNumber}}" data-search="{{formatPhoneNumber number.phoneNumber}} {{number.phoneNumber}} {{number.locality.city}} {{number.locality.country}}">
+<div class="item-row" data-id="{{number.phoneNumber}}">
 	<div class="features-block pull-right">
 		<div class="edit-features">
 			<div class="navbar">