From e7a476e6b69f0fb2c1ffaf622b72025b6c0221bb Mon Sep 17 00:00:00 2001
From: wvengen <dev-voko@willem.engen.nl>
Date: Thu, 5 Jun 2014 00:11:14 +0200
Subject: [PATCH] remove unused season import fields

---
 app/views/articles/upload.html.haml | 4 ++--
 config/locales/de.yml               | 3 +--
 config/locales/en.yml               | 3 +--
 config/locales/fr.yml               | 3 +--
 config/locales/nl.yml               | 3 +--
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/views/articles/upload.html.haml b/app/views/articles/upload.html.haml
index 6a8b4d50..ff200576 100644
--- a/app/views/articles/upload.html.haml
+++ b/app/views/articles/upload.html.haml
@@ -12,8 +12,8 @@
      Article.human_attribute_name(:tax),
      Article.human_attribute_name(:deposit),
      Article.human_attribute_name(:unit_quantity),
-     t('.fields.season_amount'),
-     t('.fields.season_price'),
+     t('.fields.reserved'),
+     t('.fields.reserved'),
      Article.human_attribute_name(:article_category)].join(" | ")
 
 = form_for :articles, :url => parse_upload_supplier_articles_path(@supplier),
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 8ac805d5..ae31a664 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -398,8 +398,7 @@ de:
     upload:
       body: <p>Die Datei muss eine Textdatei mit der Endung '.csv' sein. Die erste Zeile wird beim Einlesen ignoriert.</p> <p>Die Felder müssen mit einem Semikolon (';') getrennt und der Text mit doppelten Anführungszeichen ("Text...") umklammert werden.</p> <p>Als Zeichensatz wird UTF-8 erwartet. Korrekte Reihenfolge der Spalten:</p>
       fields:
-        season_amount: Staffelmenge
-        season_price: Staffelpreis
+        reserved: 
         status: Status (x=ausgelistet)
       file_label: Bitte wähle eine kompatible Datei aus
       submit: Datei hochladen
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6f00e440..104a51cc 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -400,8 +400,7 @@ en:
     upload:
       body: <p>The file has to be a text file with the ending '.csv' The first line will be ignored when imported</p> <p>The fields have to be separated with semicolons (';') and the text enclosed by double quotation marks ("text...").</p> <p>As character set UTF-8 is demanded. Correct order of the column:</p>
       fields:
-        season_amount: Scaled amount
-        season_price: Scaled price
+        reserved: (Reserved)
         status: Status (x=skip)
       file_label: Please choose a compatible file
       submit: Upload file
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 75236766..7b2a939a 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -403,8 +403,7 @@ fr:
         <p>Les champs doivent être délimités par des points-virgules (';'), et le texte compris entre guillemets ("texte...")</p>
         <p>L'encodage du fichier doit être UTF-8. L'ordre des colonnes est:</p>
       fields:
-        season_amount: Quantité échelonnée
-        season_price: Prix échelonné
+        reserved: 
         status: Statut (x=exclu)
       file_label: Merci de choisir un fichier compatible
       submit: Transférer le fichier
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 7c06d468..c0266e14 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -398,8 +398,7 @@ nl:
     upload:
       body: <p>Het bestand moet een utf-8 tekstbestand zijn met als extensie '.csv'. De eerste regel wordt overgeslagen.</p> <p>Velden moeten met een puntkomma (';') gescheiden worden, en tekst mag tussen dubbele aanhalingstekstens ("Tekst...") staan.</p> <p>Volgende van de kolommen:</p>
       fields:
-        season_amount: 
-        season_price: 
+        reserved: (Leeg)
         status: Status (x=overslaan)
       file_label: Graag een compatibel bestand uitkiezen
       submit: Bestand uploaden