From a9a05386da43e2bcc4a12b7a7b50d36a4b894cc6 Mon Sep 17 00:00:00 2001
From: Alex Lebrun <ar7hur@users.noreply.github.com>
Date: Mon, 22 May 2017 18:44:55 +0200
Subject: [PATCH] Revert "[PT] Adds contractions of preposition 'desse' and
 'deste' (of this) as current moment" (#244)

* Revert "[HE] commented out failing tests (bug #242) (#243)"

This reverts commit 43145a6cd3feaeca6b0427e9a1c5135bb2f3da63.

* Revert "[PT] Adds contractions of preposition 'desse' and 'deste' (of this) as current moment (#218)"

This reverts commit 79a00a4eeb4790dc4326397bb6c316962aa11bfb.
---
 resources/languages/pt/corpus/time.clj | 4 ----
 resources/languages/pt/rules/time.clj  | 6 +++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/resources/languages/pt/corpus/time.clj b/resources/languages/pt/corpus/time.clj
index 3605564d..1ae333d0 100644
--- a/resources/languages/pt/corpus/time.clj
+++ b/resources/languages/pt/corpus/time.clj
@@ -7,15 +7,11 @@
   "ja"
   "nesse instante"
   "neste instante"
-  "desse instante"
-  "deste instante"
   (datetime 2013 2 12 4 30 00)
 
   "hoje"
   "nesse momento"
   "neste momento"
-  "desse momento"
-  "deste momento"
   (datetime 2013 2 12)
 
   "ontem"
diff --git a/resources/languages/pt/rules/time.clj b/resources/languages/pt/rules/time.clj
index d3adb75a..26a10161 100644
--- a/resources/languages/pt/rules/time.clj
+++ b/resources/languages/pt/rules/time.clj
@@ -173,7 +173,7 @@
   ; "this Monday" => next week if today is Monday
 
   "this|next <day-of-week>"
-  [#"(?i)[nd]?es[ts][ae]|pr[óo]xim[ao]" {:form :day-of-week}]
+  [#"(?i)es[ts][ae]|pr[óo]xim[ao]" {:form :day-of-week}]
   (pred-nth-not-immediate %2 0)
 
   ;; for other preds, it can be immediate:
@@ -181,7 +181,7 @@
   ; See also: cycles in en.cycles.clj
 
   "this <time>"
-  [#"(?i)[nd]?es[ts][ae]" (dim :time)]
+  [#"(?i)es[ts][ae]" (dim :time)]
   (pred-nth %2 0)
 
   "next <time>"
@@ -372,7 +372,7 @@
   (assoc (intersect (cycle-nth :day 0) %2) :form :part-of-day) ;; removes :latent
 
   "<part-of-day> dessa semana"
-  [(dim :time #(not (:latent %))) #"(?i)([nd]?es[ts]a semana)|agora"]
+  [(dim :time #(not (:latent %))) #"(?i)(d?es[ts]a semana)|agora"]
   (assoc (intersect (cycle-nth :day 0) %1) :form :part-of-day) ;; removes :latent
 
 ; ;specific rule to address "3 in the morning","3h du matin" and extend morning span from 0 to 12