status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into appium-setup 

Conflicts:
	src/status_im/i18n.cljs
This commit is contained in:
Roman Volosovskyi 2016-06-01 19:11:51 +03:00
parent f30248e7fe a46f60c854
commit bf6d4ef256
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/status_im/chat/screen.cljs
View File

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

6
src/status_im/i18n.cljs
View File

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

9
src/status_im/translations/en.cljs
View File

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

1
src/status_im/utils/subs.cljs
View File

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