Merge pull request #2106 from kobotoolbox/1142-qrcode-barcode

Change barcode type label and icon to also mean QR code
kobotoolbox · Dec 11, 2018 · 73d7690 · 73d7690
2 parents bf71dd8 + 69ff05a
commit 73d7690
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/jsapp/xlform/src/model.configs.coffee b/jsapp/xlform/src/model.configs.coffee
@@ -222,7 +222,7 @@ module.exports = do ->
       ["geotrace", "Geotrace (GPS)"], # Can use satelite GPS coordinates
       ["geoshape", "Geoshape (GPS)"], # Can use satelite GPS coordinates
       ["image", "Image", isMedia: true], # Can use phone camera, for example
-      ["barcode", "Barcode"], # Can scan a barcode using the phone camera
+      ["barcode", "Barcode / QR code"], # Can scan a barcode using the phone camera
       ["date", "Date"], #e.g. (4 July, 1776)
       ["time", "Time"], #e.g. (4 July, 1776)
       ["datetime", "Date and Time"], #e.g. (2012-Jan-4 3:04PM)

diff --git a/jsapp/xlform/src/view.icons.coffee b/jsapp/xlform/src/view.icons.coffee
@@ -82,8 +82,8 @@ module.exports = do ->
       grouping: "r4"
       id: "note"
     ,
-      label: _t("Barcode")
-      faClass: "barcode"
+      label: _t("Barcode / QR Code")
+      faClass: "qrcode"
       grouping: "r4"
       id: "barcode"
     ,