Merge pull request bigbluebutton#291 from SenecaCDOT-BigBlueButton/ad…

…d-another-string created a new locale string for the chat module
ysm · Nov 1, 2013 · 329d2b9 · 329d2b9
2 parents 032f10b + 336c8f7
commit 329d2b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
@@ -132,6 +132,7 @@ bbb.chat.input.accessibilityName = Chat Message Editing Field
 bbb.chat.sendBtn = Send
 bbb.chat.sendBtn.toolTip = Send Message
 bbb.chat.sendBtn.accessibilityName = Send chat message
+bbb.chat.contextmenu.copyalltext = Copy All Text
 bbb.chat.publicChatUsername = Public
 bbb.chat.optionsTabName = Options
 bbb.chat.privateChatSelect = Select a person to chat with privately

diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
@@ -93,9 +93,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
       import org.bigbluebutton.modules.chat.views.ChatMessageRenderer;
       import org.bigbluebutton.modules.chat.vo.ChatMessageVO;
       import org.bigbluebutton.util.i18n.ResourceUtil;
-
-			
-			public static const COPY_ALL_BUTTON:String = "Copy All Text";
 			
       public var publicChat:Boolean = false;
       public var chatWithUserID:String;
@@ -325,15 +322,15 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				var contextMenu:ContextMenu = new ContextMenu();
 				contextMenu.hideBuiltInItems();
 				
-				var copyAllButton:ContextMenuItem = new ContextMenuItem(COPY_ALL_BUTTON);
+				var copyAllButton:ContextMenuItem = new ContextMenuItem(ResourceUtil.getInstance().getString("bbb.chat.contextmenu.copyalltext"));
 				copyAllButton.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, menuItemHandler);
 				contextMenu.customItems.push(copyAllButton);
 				
 				this.contextMenu = contextMenu;
 			}
 			
 			private function menuItemHandler(e:ContextMenuEvent):void{
-				if (e.target.caption == COPY_ALL_BUTTON){
+				if (e.target.caption == ResourceUtil.getInstance().getString("bbb.chat.contextmenu.copyalltext")){
 					System.setClipboard(chatMessages.getAllMessageAsString());
 				}
 			}
@@ -359,6 +356,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			private function localeChanged(e:Event):void {
 				var modifier:String = ExternalInterface.call("determineModifier");
 		  		loadKeyCombos(modifier);
+				
+				addContextMenuItems();
 			}
 
 			private function loadKeyCombos(modifier:String):void {