card 1.97.0.1 → 1.99.0

data/mod/core/spec/set/all/export_spec.rb

@@ -19,8 +19,8 @@ RSpec.describe Card::Set::All::Export do
         expect(export_pointer(%w[T A+B])).to include(
           a_hash_including(name: "pointer export card", type: "Pointer",
                            content: "[[T]]\n[[A+B]]"),
-          a_hash_including(name: "T", type: "Basic", content: "Theta"),
-          a_hash_including(name: "A+B", type: "Basic", content: "AlphaBeta")
+          a_hash_including(name: "T", type: "RichText", content: "Theta"),
+          a_hash_including(name: "A+B", type: "RichText", content: "AlphaBeta")
         )
       end
       it "handles multi levels pointer cards" do
@@ -30,8 +30,8 @@ RSpec.describe Card::Set::All::Export do
                            content: "[[inner pointer]]\n[[A+B]]"),
           a_hash_including(name: "inner pointer", type: "Pointer",
                            content: "[[T]]"),
-          a_hash_including(name: "T", type: "Basic", content: "Theta"),
-          a_hash_including(name: "A+B", type: "Basic", content: "AlphaBeta")
+          a_hash_including(name: "T", type: "RichText", content: "Theta"),
+          a_hash_including(name: "A+B", type: "RichText", content: "AlphaBeta")
         )
       end
 
@@ -51,7 +51,7 @@ RSpec.describe Card::Set::All::Export do
         expect(export).to include(
           a_hash_including(name: "skin export card", type: "Skin",
                            content: "[[T]]"),
-          a_hash_including(name: "T", type: "Basic", content: "Theta")
+          a_hash_including(name: "T", type: "RichText", content: "Theta")
         )
       end
     end
@@ -61,8 +61,8 @@ RSpec.describe Card::Set::All::Export do
         expect(export_pointer('{"left":"A"}', :search_type)).to include(
           a_hash_including(name: "search_type export card", type: "Search",
                            content: '{"left":"A"}'),
-          a_hash_including(name: "A+B", content: "AlphaBeta", type: "Basic"),
-          a_hash_including(name: "A+C", type: "Basic")
+          a_hash_including(name: "A+B", content: "AlphaBeta", type: "RichText"),
+          a_hash_including(name: "A+C", type: "RichText")
         )
       end
     end

data/mod/core/spec/set/all/fetch_spec.rb

@@ -180,7 +180,7 @@ RSpec.describe Card::Set::All::Fetch do
         expect(card).to be_virtual.and have_content "Right Content"
 
         #        warn 'creating template'
-        tpr = Card.create! name: "Basic+y+*type plus right+*structure",
+        tpr = Card.create! name: "RichText+y+*type plus right+*structure",
                            content: "Type Plus Right Content"
         card = Card.fetch("a+y")
         expect(card).to be_virtual.and have_content "Type Plus Right Content"
@@ -307,7 +307,7 @@ RSpec.describe Card::Set::All::Fetch do
     end
 
     example "id" do
-      expect(Card.fetch_name(Card::BasicID)).to eq "Basic"
+      expect(Card.fetch_name(Card::BasicID)).to eq "RichText"
     end
 
     example "invalid id" do

data/mod/core/spec/set/all/pattern_spec.rb

@@ -5,10 +5,10 @@ RSpec.describe Card::Set::All::Pattern do
     it "returns self, type, all for simple cards" do
       Card::Auth.as_bot do
         card = Card.new(name: "AnewCard")
-        expect(card.set_names).to eq(["Basic+*type", "*all"])
+        expect(card.set_names).to eq(["RichText+*type", "*all"])
         card.save!
         card = Card.fetch("AnewCard")
-        expect(card.set_names).to eq(["AnewCard+*self", "Basic+*type", "*all"])
+        expect(card.set_names).to eq(["AnewCard+*self", "RichText+*type", "*all"])
       end
     end
 
@@ -26,7 +26,7 @@ RSpec.describe Card::Set::All::Pattern do
       Card::Auth.as_bot do
         expect(Card.new(name: "Iliad+author").set_names).to eq(
           [
-            "Book+author+*type plus right", "author+*right", "Basic+*type",
+            "Book+author+*type plus right", "author+*right", "RichText+*type",
             "*all plus", "*all"
           ]
         )
@@ -37,7 +37,7 @@ RSpec.describe Card::Set::All::Pattern do
       expect(Card.new(name: "Iliad+*to").set_names).to eq(
         [
           "Book+*to+*type plus right", "*to+*right", "*rstar",
-          "Pointer+*type", "*all plus", "*all"
+          "List+*type", "*all plus", "*all"
         ]
       )
     end
@@ -46,7 +46,7 @@ RSpec.describe Card::Set::All::Pattern do
       expect(Card.new(name: "*all+*create").set_names).to eq(
         [
           "Set+*create+*type plus right", "*create+*right", "*rule", "*rstar",
-          "Pointer+*type", "*all plus", "*all"
+          "List+*type", "*all plus", "*all"
         ]
       )
     end
@@ -71,22 +71,22 @@ RSpec.describe Card::Set::All::Pattern do
     it "returns css names for simple star cards" do
       Card::Auth.as_bot do
         card = Card.new(name: "*AnewCard")
-        expect(card.safe_set_keys).to eq("ALL TYPE-basic STAR")
+        expect(card.safe_set_keys).to eq("ALL TYPE-rich_text STAR")
         card.save!
         card = Card.fetch("*AnewCard")
-        expect(card.safe_set_keys).to eq("ALL TYPE-basic STAR SELF-Xanew_card")
+        expect(card.safe_set_keys).to eq("ALL TYPE-rich_text STAR SELF-Xanew_card")
       end
     end
 
     it "returns set names for junction cards" do
       card = Card.new(name: "Iliad+author")
       expect(card.safe_set_keys).to eq(
-        "ALL ALL_PLUS TYPE-basic RIGHT-author TYPE_PLUS_RIGHT-book-author"
+        "ALL ALL_PLUS TYPE-rich_text RIGHT-author TYPE_PLUS_RIGHT-book-author"
       )
       card.save!
       card = Card.fetch("Iliad+author")
       expect(card.safe_set_keys).to eq(
-        "ALL ALL_PLUS TYPE-basic RIGHT-author TYPE_PLUS_RIGHT-book-author "\
+        "ALL ALL_PLUS TYPE-rich_text RIGHT-author TYPE_PLUS_RIGHT-book-author "\
         "SELF-iliad-author"
       )
     end

data/mod/core/spec/set/all/permissions_spec.rb

@@ -86,17 +86,7 @@ RSpec.describe Card::Set::All::Permissions do
       end
     end
 
-    it "is granted to admin if to anybody" do
-      Card::Auth.as_bot do
-        c1 = Card["c1"]
-        Card.create! name: "c1+*self+*comment", type: "Pointer",
-                     content: "[[r1]]"
-        expect(c1.who_can(:comment)).to eq([Card["r1"].id])
-        expect(c1.ok?(:comment)).to be_truthy
-      end
-    end
-
-    it "reader setting" do
+    it "reader setting", aggregate_failures: true do
       Card.where(trash: false).each do |ca|
         rule_id, rule_class = ca.permission_rule_id_and_class :read
         expect(ca.read_rule_class).to eq(rule_class),

data/mod/core/spec/set/all/rules2_spec.rb

@@ -4,7 +4,7 @@
 # I think we should move the rendering tests into basic and trim this to about
 # a quarter of its current length
 
-describe Card do
+RSpec.describe Card do
   RSpec::Matchers.define :have_toc do
     match do |card|
       values_match?(/Table of Contents/, card.format.render_open_content)
@@ -19,7 +19,7 @@ describe Card do
   context "when there is a general toc rule of 2" do
     before do
       Card::Auth.as_bot do
-        described_class.create! name: "Basic+*type+*table of contents", content: "2"
+        create [:basic, :type, :table_of_contents], "2"
       end
     end
 
@@ -58,18 +58,18 @@ describe Card do
       end
       # it "shows type plus right sets when they exist" do
       #   Card::Auth.as_bot do
-      #     Card.create name: 'Basic+A+*type plus right', content: ''
+      #     Card.create name: 'RichText+A+*type plus right', content: ''
       #   end
       #   sets = Card['A'].related_sets
-      #   sets.should == ['A+*self', 'A+*right', 'Basic+A+*type plus right']
+      #   sets.should == ['A+*self', 'A+*right', 'RichText+A+*type plus right']
       # end
       # it "shows type plus right sets when they exist, and type" do
       #   Card::Auth.as_bot do
-      #     Card.create name: 'Basic+Cardtype A+*type plus right', content: ''
+      #     Card.create name: 'RichText+Cardtype A+*type plus right', content: ''
       #   end
       #   sets = Card['Cardtype A'].related_sets
       #   sets.should == ['Cardtype A+*self', 'Cardtype A+*type',
-      #     'Cardtype A+*right', 'Basic+Cardtype A+*type plus right']
+      #     'Cardtype A+*right', 'RichText+Cardtype A+*type plus right']
       # end
       it "is empty for a non-simple card" do
         sets = described_class["A+B"].related_sets.map { |s| s[0] }
@@ -170,7 +170,7 @@ describe Card do
   context "when I create a new rule" do
     before do
       Card::Auth.as_bot do
-        described_class.create! name: "Basic+*type+*table of contents", content: "2"
+        described_class.create! name: "RichText+*type+*table of contents", content: "2"
         @c1 = described_class.create! name: "toc1", type: "CardtypeE",
                                       content: described_class["Onne Heading"].content
         @c2 = described_class.create! name: "toc2", content: described_class["Twwo Heading"].content

data/mod/core/spec/set/all/rules_spec.rb

@@ -14,19 +14,9 @@ describe Card::Set::All::Rules do
 
   describe "#rule" do
     it "retrieves Set based value" do
-      Card.create name: "Book+*type+*add help", content: "authorize"
-      add_help_rule = Card.new(type: "Book").rule(:add_help, fallback: :help)
-      expect(add_help_rule).to eq("authorize")
-    end
-
-    it "retrieves default values" do
-      # Card.create name: 'all Basic cards', type: 'Set',
-      #            content: "{\"type\": \"Basic\'}'
-      # defaults should work when other Sets are present
-      assert Card.create(name: "*all+*add help", content: "lobotomize")
-      # Card.default_rule(:add_help, fallback: :help).should == 'lobotomize'
-      add_help_rule = Card.new(type: "Basic").rule(:add_help, fallback: :help)
-      expect(add_help_rule).to eq("lobotomize")
+      Card.create name: "Book+*type+*help", content: "authorize"
+      help_rule = Card.new(type: "Book").rule(:help)
+      expect(help_rule).to eq("authorize")
     end
 
     it "retrieves single values" do
@@ -38,19 +28,19 @@ describe Card::Set::All::Rules do
       before do
         Card.create name: "*all+*help", content: "edit any kind of card"
       end
-      subject { Card.new(type: "Book").rule(:add_help, fallback: :help) }
+      subject { Card.new(type: "Book").rule(:csv_structure, fallback: :help) }
 
       it "retrieves default setting" do
         expect(subject).to eq("edit any kind of card")
       end
 
       it "retrieves primary setting" do
-        Card.create name: "*all+*add help", content: "add any kind of card"
+        Card.create name: "*all+*csv_structure", content: "add any kind of card"
         expect(subject).to eq("add any kind of card")
       end
 
       it "retrieves more specific default setting" do
-        Card.create name: "*all+*add help", content: "add any kind of card"
+        Card.create name: "*all+*csv_structure", content: "add any kind of card"
         Card.create name: "*Book+*type+*help", content: "edit a Book"
         expect(subject).to eq("add any kind of card")
       end

data/mod/core/spec/set/all/templating_spec.rb

@@ -43,9 +43,7 @@ describe Card::Set::All::Templating do
 
     it "has type and content overridden by (new) type_plus_right set" do
       Card::Auth.as_bot do
-        Card.create! name: "Basic+birthday+*type plus right+*structure",
-                     type: "PlainText",
-                     content: "Yesterday"
+        create_plain_text "RichText+birthday+*type plus right+*structure", "Yesterday"
       end
       jb = @jb.refresh true
       expect(jb.content).to eq("Yesterday")
@@ -82,9 +80,7 @@ describe Card::Set::All::Templating do
   describe "with type structure" do
     before do
       Card::Auth.as_bot do
-        @dt = Card.create! name: "Date+*type+*structure",
-                           type: "Basic",
-                           content: "Tomorrow"
+        @dt = create_basic "Date+*type+*structure", "Tomorrow"
       end
     end
 

data/mod/core/spec/set/all/type_spec.rb

@@ -26,7 +26,7 @@ describe Card::Set::All::Type do
     end
   end
 
-  describe "card with structured type" do
+  xdescribe "card with structured type" do
     before do
       Card::Auth.as_bot do
         Card.create! name: "Topic", type: "Cardtype"
@@ -39,7 +39,7 @@ describe Card::Set::All::Type do
     it "clears cache of structured nested card after saving" do
       pending "need new mechanism to replace #reset_type_specific_fields"
       Card::Auth.as_bot do
-        expect(Card.fetch("t1+results", new: {}).type_name).to eq("Basic")
+        expect(Card.fetch("t1+results", new: {}).type_name).to eq("RichText")
 
         topic1 = Card.new type: "Topic", name: "t1"
         topic1.format._render_new

data/mod/date/set/all/calendar.rb

@@ -4,6 +4,6 @@ format :html do
   def calendar_input
     text_field :content, class: "date-editor datetimepicker-input",
                          "data-toggle": "datetimepicker",
-                         "data-target": "##{form_prefix}_content"
+                         "data-target": "##{form_prefix}_content.date-editor"
   end
 end

data/mod/date/set/self/datepicker.rb

@@ -0,0 +1,6 @@
+def raw_help_text
+  <<-TEXT
+    Configure the date select tool using these available 
+    [[https://tempusdominus.github.io/bootstrap-4/Options/|options]]
+  TEXT
+end

data/mod/date/set/type/date.rb

@@ -1,5 +1,5 @@
 format :html do
-  def editor
+  def input_type
     :calendar
   end
 end

data/mod/date/spec/set/type/date_spec.rb

@@ -2,6 +2,6 @@
 
 describe Card::Set::Type::Date do
   it "has special editor" do
-    assert_view_select render_editor("Date"), 'input[class~="date-editor"]'
+    assert_view_select render_input("Date"), 'input[class~="date-editor"]'
   end
 end

data/mod/date/vendor/moment/CHANGELOG.md

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+### 2.22.2 [See full changelog](https://gist.github.com/marwahaha/4d992c13c2dbc0f59d4d8acae1dc6d3a)
+
+* Release May 31, 2018
+
+* [#4564](https://github.com/moment/moment/pull/4564) [bugfix] Avoid using trim()
+* [#4453](https://github.com/moment/moment/pull/4453) [bugfix] Treat periods as periods, not regex-anything period, for weekday parsing in strict mode.
+* Minor locale improvements (pa-in, be, az)
+
 ### 2.22.1 [See full changelog](https://gist.github.com/marwahaha/ff2cd13d0eda08afb7a237b10aae558c)
 
 * Release Apr 14, 2018

data/mod/date/vendor/moment/Moment.js.nuspec

@@ -2,16 +2,16 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Moment.js</id>
-        <version>2.22.1</version>
+        <version>2.22.2</version>
         <authors>Tim Wood, Iskren Chernev, Moment.js contributors</authors>
         <owners>Cory Deppen, Iskren Chernev</owners>
         <description>A lightweight JavaScript date library for parsing, manipulating, and formatting dates.</description>
         <releaseNotes>
-            * Release Apr 14, 2018 
+            * Release May 31, 2018
 
-            * [#4495](https://github.com/moment/moment/pull/4495) [bugfix] Added HTML5_FMT to moment.d.ts
-            * Minor locale improvements
-            * QUnit upgrade and coveralls reporting
+            * [#4564](https://github.com/moment/moment/pull/4564) [bugfix] Avoid using trim()
+            * [#4453](https://github.com/moment/moment/pull/4453) [bugfix] Treat periods as periods, not regex-anything period, for weekday parsing in strict mode.
+            * Minor locale improvements (pa-in, be, az)
         </releaseNotes>
         <projectUrl>http://momentjs.com/</projectUrl>
         <iconUrl>http://pbs.twimg.com/profile_images/482670411402858496/Xrtdc94q_normal.png</iconUrl>

data/mod/date/vendor/moment/component.json

@@ -1,6 +1,6 @@
 {
   "name": "moment",
-  "version": "2.22.1",
+  "version": "2.22.2",
   "main": "moment.js",
   "description": "Parse, validate, manipulate, and display dates in JavaScript.",
   "files": [

data/mod/date/vendor/moment/locale/az.js

@@ -55,7 +55,7 @@
         relativeTime : {
             future : '%s sonra',
             past : '%s əvvəl',
-            s : 'birneçə saniyyə',
+            s : 'birneçə saniyə',
             ss : '%d saniyə',
             m : 'bir dəqiqə',
             mm : '%d dəqiqə',

data/mod/date/vendor/moment/locale/be.js

@@ -41,7 +41,7 @@
         weekdays : {
             format: 'нядзелю_панядзелак_аўторак_сераду_чацвер_пятніцу_суботу'.split('_'),
             standalone: 'нядзеля_панядзелак_аўторак_серада_чацвер_пятніца_субота'.split('_'),
-            isFormat: /\[ ?[Вв] ?(?:мінулую|наступную)? ?\] ?dddd/
+            isFormat: /\[ ?[Ууў] ?(?:мінулую|наступную)? ?\] ?dddd/
         },
         weekdaysShort : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
         weekdaysMin : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),

data/mod/date/vendor/moment/locale/pa-in.js

@@ -51,7 +51,7 @@
         calendar : {
             sameDay : '[ਅਜ] LT',
             nextDay : '[ਕਲ] LT',
-            nextWeek : 'dddd, LT',
+            nextWeek : '[ਅਗਲਾ] dddd, LT',
             lastDay : '[ਕਲ] LT',
             lastWeek : '[ਪਿਛਲੇ] dddd, LT',
             sameElse : 'L'

data/mod/date/vendor/moment/meteor/package.js

@@ -6,7 +6,7 @@ var packageName = 'momentjs:moment';  // https://atmospherejs.com/momentjs/momen
 Package.describe({
   name: packageName,
   summary: 'Moment.js (official): parse, validate, manipulate, and display dates - official Meteor packaging',
-  version: '2.22.1',
+  version: '2.22.2',
   git: 'https://github.com/moment/moment.git'
 });
 

data/mod/date/vendor/moment/min/locales.js

@@ -628,7 +628,7 @@
         relativeTime : {
             future : '%s sonra',
             past : '%s əvvəl',
-            s : 'birneçə saniyyə',
+            s : 'birneçə saniyə',
             ss : '%d saniyə',
             m : 'bir dəqiqə',
             mm : '%d dəqiqə',
@@ -707,7 +707,7 @@
         weekdays : {
             format: 'нядзелю_панядзелак_аўторак_сераду_чацвер_пятніцу_суботу'.split('_'),
             standalone: 'нядзеля_панядзелак_аўторак_серада_чацвер_пятніца_субота'.split('_'),
-            isFormat: /\[ ?[Вв] ?(?:мінулую|наступную)? ?\] ?dddd/
+            isFormat: /\[ ?[Ууў] ?(?:мінулую|наступную)? ?\] ?dddd/
         },
         weekdaysShort : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
         weekdaysMin : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
@@ -5919,7 +5919,7 @@
 
     //! moment.js locale configuration
 
-    var symbolMap$10 = {
+    var symbolMap$a = {
         '1': '१',
         '2': '२',
         '3': '३',
@@ -6028,7 +6028,7 @@
         },
         postformat: function (string) {
             return string.replace(/\d/g, function (match) {
-                return symbolMap$10[match];
+                return symbolMap$a[match];
             });
         },
         meridiemParse: /रात्री|सकाळी|दुपारी|सायंकाळी/,
@@ -6255,7 +6255,7 @@
 
     //! moment.js locale configuration
 
-    var symbolMap$11 = {
+    var symbolMap$b = {
         '1': '၁',
         '2': '၂',
         '3': '၃',
@@ -6266,7 +6266,7 @@
         '8': '၈',
         '9': '၉',
         '0': '၀'
-    }, numberMap$10 = {
+    }, numberMap$a = {
         '၁': '1',
         '၂': '2',
         '၃': '3',
@@ -6320,12 +6320,12 @@
         },
         preparse: function (string) {
             return string.replace(/[၁၂၃၄၅၆၇၈၉၀]/g, function (match) {
-                return numberMap$10[match];
+                return numberMap$a[match];
             });
         },
         postformat: function (string) {
             return string.replace(/\d/g, function (match) {
-                return symbolMap$11[match];
+                return symbolMap$b[match];
             });
         },
         week: {
@@ -6386,7 +6386,7 @@
 
     //! moment.js locale configuration
 
-    var symbolMap$12 = {
+    var symbolMap$c = {
         '1': '१',
         '2': '२',
         '3': '३',
@@ -6398,7 +6398,7 @@
         '9': '९',
         '0': '०'
     },
-    numberMap$11 = {
+    numberMap$b = {
         '१': '1',
         '२': '2',
         '३': '3',
@@ -6429,12 +6429,12 @@
         },
         preparse: function (string) {
             return string.replace(/[१२३४५६७८९०]/g, function (match) {
-                return numberMap$11[match];
+                return numberMap$b[match];
             });
         },
         postformat: function (string) {
             return string.replace(/\d/g, function (match) {
-                return symbolMap$12[match];
+                return symbolMap$c[match];
             });
         },
         meridiemParse: /राति|बिहान|दिउँसो|साँझ/,
@@ -6695,7 +6695,7 @@
 
     //! moment.js locale configuration
 
-    var symbolMap$13 = {
+    var symbolMap$d = {
         '1': '੧',
         '2': '੨',
         '3': '੩',
@@ -6707,7 +6707,7 @@
         '9': '੯',
         '0': '੦'
     },
-    numberMap$12 = {
+    numberMap$c = {
         '੧': '1',
         '੨': '2',
         '੩': '3',
@@ -6738,7 +6738,7 @@
         calendar : {
             sameDay : '[ਅਜ] LT',
             nextDay : '[ਕਲ] LT',
-            nextWeek : 'dddd, LT',
+            nextWeek : '[ਅਗਲਾ] dddd, LT',
             lastDay : '[ਕਲ] LT',
             lastWeek : '[ਪਿਛਲੇ] dddd, LT',
             sameElse : 'L'
@@ -6761,12 +6761,12 @@
         },
         preparse: function (string) {
             return string.replace(/[੧੨੩੪੫੬੭੮੯੦]/g, function (match) {
-                return numberMap$12[match];
+                return numberMap$c[match];
             });
         },
         postformat: function (string) {
             return string.replace(/\d/g, function (match) {
-                return symbolMap$13[match];
+                return symbolMap$d[match];
             });
         },
         // Punjabi notation for meridiems are quite fuzzy in practice. While there exists
@@ -8188,7 +8188,7 @@
 
     //! moment.js locale configuration
 
-    var symbolMap$14 = {
+    var symbolMap$e = {
         '1': '௧',
         '2': '௨',
         '3': '௩',
@@ -8199,7 +8199,7 @@
         '8': '௮',
         '9': '௯',
         '0': '௦'
-    }, numberMap$13 = {
+    }, numberMap$d = {
         '௧': '1',
         '௨': '2',
         '௩': '3',
@@ -8256,12 +8256,12 @@
         },
         preparse: function (string) {
             return string.replace(/[௧௨௩௪௫௬௭௮௯௦]/g, function (match) {
-                return numberMap$13[match];
+                return numberMap$d[match];
             });
         },
         postformat: function (string) {
             return string.replace(/\d/g, function (match) {
-                return symbolMap$14[match];
+                return symbolMap$e[match];
             });
         },
         // refer http://ta.wikipedia.org/s/1er1
@@ -8672,7 +8672,7 @@
         return time;
     }
 
-    function translate$10(number, withoutSuffix, string, isFuture) {
+    function translate$a(number, withoutSuffix, string, isFuture) {
         var numberNoun = numberAsNoun(number);
         switch (string) {
             case 'ss':
@@ -8734,17 +8734,17 @@
             future : translateFuture,
             past : translatePast,
             s : 'puS lup',
-            ss : translate$10,
+            ss : translate$a,
             m : 'wa’ tup',
-            mm : translate$10,
+            mm : translate$a,
             h : 'wa’ rep',
-            hh : translate$10,
+            hh : translate$a,
             d : 'wa’ jaj',
-            dd : translate$10,
+            dd : translate$a,
             M : 'wa’ jar',
-            MM : translate$10,
+            MM : translate$a,
             y : 'wa’ DIS',
-            yy : translate$10
+            yy : translate$a
         },
         dayOfMonthOrdinalParse: /\d{1,2}\./,
         ordinal : '%d.',