From 8f402d2f31202f77c4b058cfb4159969125593f9 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Tue, 23 Sep 2014 21:06:05 +0400
Subject: [PATCH] Fxied i18n dashed vars

Closes #483
---
 app/js/i18n.js                            | 2 +-
 app/js/locales/en-us.json                 | 4 ++--
 app/partials/desktop/message_service.html | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/js/i18n.js b/app/js/i18n.js
index a6dd6cbc..b557ddb2 100644
--- a/app/js/i18n.js
+++ b/app/js/i18n.js
@@ -5,7 +5,7 @@ angular.module('myApp.i18n', ['izhukov.utils'])
     var locale = Config.I18n.locale;
     var messages = Config.I18n.messages;
     var fallbackMessages = Config.I18n.fallback_messages;
-    var paramRegEx = /\{\s*([a-zA-Z\d\--]+)(?:\s*:\s*(.*?))?\s*\}/g;
+    var paramRegEx = /\{\s*([a-zA-Z\d\-_]+)(?:\s*:\s*(.*?))?\s*\}/g;
 
     function insertParams(msgstr, params) {
       return msgstr.replace(paramRegEx, function ($0, paramKey, nestedMsgStr) {
diff --git a/app/js/locales/en-us.json b/app/js/locales/en-us.json
index 146c6151..dde9fe2f 100644
--- a/app/js/locales/en-us.json
+++ b/app/js/locales/en-us.json
@@ -173,8 +173,8 @@
 	"conversation_unknown_user": "Somebody",
 	"conversation_unknown_chat": "Unknown chat",
 
-	"message_service_created_group": "created the group {group_name}",
-	"message_service_changed_group_name": "changed group name to {group_name}",
+	"message_service_created_group": "created the group {group-name}",
+	"message_service_changed_group_name": "changed group name to {group-name}",
 	"message_service_changed_group_photo": "changed group photo",
 	"message_service_removed_group_photo": "removed group photo",
 	"message_service_invited_user": "invited {user}",
diff --git a/app/partials/desktop/message_service.html b/app/partials/desktop/message_service.html
index cbb72f9d..d23f9f1b 100644
--- a/app/partials/desktop/message_service.html
+++ b/app/partials/desktop/message_service.html
@@ -2,7 +2,7 @@
   <my-i18n>
     <span ng-switch-when="messageActionChatCreate" my-i18n-format="message_service_created_group"></span>
     <span ng-switch-when="messageActionChatEditTitle" my-i18n-format="message_service_changed_group_name"></span>
-    <my-i18n-param name="group_name">&laquo;<strong ng-bind-html="::historyMessage.action.rTitle"></strong>&raquo;</my-i18n-param>
+    <my-i18n-param name="group-name">&laquo;<strong ng-bind-html="::historyMessage.action.rTitle"></strong>&raquo;</my-i18n-param>
   </my-i18n>
   <span ng-switch-when="messageActionChatEditPhoto" my-i18n="message_service_changed_group_photo"></span>
   <span ng-switch-when="messageActionChatDeletePhoto" my-i18n="message_service_removed_group_photo"></span>