Merge branch 'develop' into appium-setup

Conflicts:
	src/status_im/i18n.cljs


Former-commit-id: bf6d4ef256

src/status_im/chat/screen.cljs

@@ -3,12 +3,12 @@
   (:require [re-frame.core :refer [subscribe dispatch]]
             [clojure.string :as s]
             [status-im.components.react :refer [view
-                                              text
-                                              image
-                                              icon
-                                              touchable-highlight
-                                              list-view
-                                              list-item]]
+                                                text
+                                                image
+                                                icon
+                                                touchable-highlight
+                                                list-view
+                                                list-item]]
             [status-im.components.chat-icon.screen :refer [chat-icon-view-action
                                                            chat-icon-view-menu-item]]
             [status-im.chat.styles.screen :as st]
@@ -18,7 +18,7 @@
             [status-im.components.toolbar :refer [toolbar]]
             [status-im.chat.views.message :refer [chat-message]]
             [status-im.chat.views.new-message :refer [chat-message-new]]
-            [status-im.i18n :refer [label]]))
+            [status-im.i18n :refer [label label-pluralize]]))
 
 
 (defn contacts-by-identity [contacts]
@@ -186,7 +186,7 @@
           [icon :group st/group-icon]
           [text {:style st/members}
            (let [cnt (inc (count @contacts))]
-             (label :t/members {:count cnt}))]]
+             (label-pluralize cnt :t/members))]]
          ;; TODO stub data: last activity
          [text {:style st/last-activity} (label :t/last-active)])])))
 

src/status_im/i18n.cljs

@@ -13,3 +13,9 @@
   (if (exists? i18n.t)
     (.t i18n (name path) (clj->js options))
     (name path)))
+
+(defn label-pluralize [count path & options]
+  (if (exists? i18n.t)
+    (.p i18n count (name path) (clj->js options))
+    (name path)))
+

src/status_im/translations/en.cljs

@@ -18,7 +18,8 @@
    :and-you                               "and you"
    :search-chat                           "Search chat"
    :members                               {:one   "1 member, 1 active"
-                                           :other "{{count}} members, {{count}} active"}
+                                           :other "{{count}} members, {{count}} active"
+                                           :zero  "no members"}
    :last-active                           "Active a minute ago"
 
    ;profile
@@ -70,6 +71,7 @@
    ;contacts
    :contacts                              "Contacts"
    :no-name                               "Noname"
+   :new-contact                           "New Contact"
 
    ;group-settings
    :remove                                "Remove"
@@ -112,4 +114,9 @@
    :removed                               "removed"
    :You                                   "You"
 
+   ;new-contact
+   :import-qr                             "Import from QR"
+   :contact-name                          "Contact Name"
+   :contact-address                       "Contact Address"
+
    })

src/status_im/utils/subs.cljs

@@ -5,7 +5,6 @@
   "Creates subscrition that cheks if collection (map or set) contains element"
   [collection]
   (fn [db [_ element]]
-    (println "WWWWWWWWWW" (type db))
     (-> (collection @db)
         (contains? element)
         (reaction))))