Merge remote-tracking branch 'origin/master' into patch-1

2016-12-05 20:44:21 -05:00
parent e0b8283338 8ecf01eafa
commit 6ff986a35c
4 changed files with 4 additions and 3 deletions
--- a/data/generated-langdb.json
+++ b/data/generated-langdb.json
@@ -1836,7 +1836,7 @@
                "AS",
                "ME"
            ],
-            "لەکی‎"
+            "لەکی"
        ],
        "lkt": [
            "Latn",
--- a/data/langdb.yaml
+++ b/data/langdb.yaml
@@ -291,7 +291,7 @@ languages:
  li: [Latn, [EU], Limburgs]
  lij: [Latn, [EU], Ligure]
  liv: [Latn, [EU], Līvõ kēļ]
-  lki: [Arab, [AS, ME], لەکی‎]
+  lki: [Arab, [AS, ME], لەکی]
  lkt: [Latn, [AM], Lakȟótiyapi]
  lld: [Latn, [EU], Ladin]
  lmo: [Latn, [EU], lumbaart]
--- a/src/jquery.uls.data.js
+++ b/src/jquery.uls.data.js
--- a/src/jquery.uls.lcd.js
+++ b/src/jquery.uls.lcd.js
@@ -35,6 +35,7 @@
 			.addClass( 'uls-no-found-more' )
 			.append(
 				$( '<div>' )
+					.attr( 'data-i18n', 'uls-search-help' )
 					.addClass( '' )
 					.append(
 						$( '<p>' ).append(