From 9c715f187e99bb675e75008b58785660ec592a1c Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Thu, 22 Oct 2015 13:58:28 +0200 Subject: [PATCH] Use language code everywhere --- examples/example-crepbook.sb | 2 +- examples/example-layout.sb | 2 +- examples/example-songs.sb | 2 +- examples/example.sb | 2 +- examples/example_encoding.sb | 2 +- patacrep/data/templates/default.tex | 16 +++++------ patacrep/data/templates/patacrep.tex | 24 ++++++++--------- patacrep/data/templates/songs.tex | 40 ++++++++++++++-------------- 8 files changed, 45 insertions(+), 45 deletions(-) diff --git a/examples/example-crepbook.sb b/examples/example-crepbook.sb index dcb27587..9c2a636c 100644 --- a/examples/example-crepbook.sb +++ b/examples/example-crepbook.sb @@ -7,7 +7,7 @@ "pictures" ], "booktype" : "chorded", -"lang" : "french", +"lang" : "fr", "authwords" : { "sep" : ["and", "et"] }, diff --git a/examples/example-layout.sb b/examples/example-layout.sb index e252ed5d..4c486924 100644 --- a/examples/example-layout.sb +++ b/examples/example-layout.sb @@ -7,7 +7,7 @@ "pictures" ], "booktype" : "chorded", -"lang" : "french", +"lang" : "fr", "authwords" : { "sep" : ["and", "et"] }, diff --git a/examples/example-songs.sb b/examples/example-songs.sb index 40ed8ebc..3a46716c 100644 --- a/examples/example-songs.sb +++ b/examples/example-songs.sb @@ -7,7 +7,7 @@ "pictures" ], "booktype" : "chorded", -"lang" : "french", +"lang" : "fr", "authwords" : { "sep" : ["and", "et"] }, diff --git a/examples/example.sb b/examples/example.sb index a003440e..55b489ad 100644 --- a/examples/example.sb +++ b/examples/example.sb @@ -6,7 +6,7 @@ "pictures" ], "booktype" : "chorded", -"lang" : "french", +"lang" : "fr", "authwords" : { "sep" : ["and", "et"] }, diff --git a/examples/example_encoding.sb b/examples/example_encoding.sb index 0519b144..bd3a63d9 100644 --- a/examples/example_encoding.sb +++ b/examples/example_encoding.sb @@ -6,7 +6,7 @@ "pictures" ], "booktype" : "chorded", -"lang" : "french", +"lang" : "fr", "authwords" : { "sep" : ["and", "et", "À"], "ignore" : ["À"], diff --git a/patacrep/data/templates/default.tex b/patacrep/data/templates/default.tex index 65c56c8f..a9504965 100644 --- a/patacrep/data/templates/default.tex +++ b/patacrep/data/templates/default.tex @@ -20,23 +20,23 @@ (* variables *) { -"classoptions": {"description": {"english": "LaTeX class options", "french": "Options de la classe LaTeX"}, +"classoptions": {"description": {"en": "LaTeX class options", "fr": "Options de la classe LaTeX"}, "type": "flag", "join": ",", "mandatory": true, "default": {"default":[]} }, -"title": {"description": {"english": "Title", "french": "Titre"}, - "default": {"english": "Guitar songbook", "french": "Recueil de chansons pour guitare"}, +"title": {"description": {"en": "Title", "fr": "Titre"}, + "default": {"en": "Guitar songbook", "fr": "Recueil de chansons pour guitare"}, "mandatory":true }, -"author": {"description": {"english": "Author", "french": "Auteur"}, - "default": {"english": "The Patacrep Team", "french": "L'équipe Patacrep"}, +"author": {"description": {"en": "Author", "fr": "Auteur"}, + "default": {"en": "The Patacrep Team", "fr": "L'équipe Patacrep"}, "mandatory":true }, -"notenamesout": {"description": {"english": "Note names. Can be 'solfedge' (Do, Re, Mi...) or 'alphascale' (A, B, C...).", - "french": "Nom des notes : 'solfedge' (Do, Ré, Mi...) ou 'alphascale' (A, B, C...)."}, - "default": {"default": "alphascale", "french": "solfedge"} +"notenamesout": {"description": {"en": "Note names. Can be 'solfedge' (Do, Re, Mi...) or 'alphascale' (A, B, C...).", + "fr": "Nom des notes : 'solfedge' (Do, Ré, Mi...) ou 'alphascale' (A, B, C...)."}, + "default": {"default": "alphascale", "fr": "solfedge"} } } (* endvariables -*) diff --git a/patacrep/data/templates/patacrep.tex b/patacrep/data/templates/patacrep.tex index 50dacf5e..b9a01f1e 100644 --- a/patacrep/data/templates/patacrep.tex +++ b/patacrep/data/templates/patacrep.tex @@ -20,42 +20,42 @@ (* variables *) { -"subtitle": {"description": {"english": "Subtitle", "french": "Sous-titre"}, +"subtitle": {"description": {"en": "Subtitle", "fr": "Sous-titre"}, "default": {"default": ""} }, -"version":{ "description": {"english": "Version", "french": "Version"}, +"version":{ "description": {"en": "Version", "fr": "Version"}, "default": {"default": "undefined"} }, -"web": {"description": {"english": "Website", "french": "Site web"}, +"web": {"description": {"en": "Website", "fr": "Site web"}, "default": {"default": "http://www.patacrep.com"} }, -"mail": {"description": {"english": "Email", "french": "Adresse électronique"}, +"mail": {"description": {"en": "Email", "fr": "Adresse électronique"}, "default": {"default": "crep@team-on-fire.com"} }, -"picture": {"description": {"english": "Cover picture", "french": "Image de couverture"}, +"picture": {"description": {"en": "Cover picture", "fr": "Image de couverture"}, "type": "file", "default": {"default": "img/treble_a"} }, -"picturecopyright": {"description": {"english": "Copyright for the cover picture", "french": "Copyright pour l'image de couverture"}, +"picturecopyright": {"description": {"en": "Copyright for the cover picture", "fr": "Copyright pour l'image de couverture"}, "default": {"default": "Dbolton \\url{http://commons.wikimedia.org/wiki/User:Dbolton}"} }, -"footer": {"description": {"english": "Footer", "french": "Pied de page"}, +"footer": {"description": {"en": "Footer", "fr": "Pied de page"}, "default": {"default": "Generated using Songbook (\\url{http://www.patacrep.com})"} }, -"songnumberbgcolor": {"description": {"english": "Number Shade", "french": "Couleur des numéros"}, +"songnumberbgcolor": {"description": {"en": "Number Shade", "fr": "Couleur des numéros"}, "type": "color", "default": {"default": "D1E4AE"} }, -"notebgcolor": {"description": {"english": "Note Shade", "french": "Couleur des notes"}, +"notebgcolor": {"description": {"en": "Note Shade", "fr": "Couleur des notes"}, "type": "color", "default": {"default": "D1E4AE"} }, -"indexbgcolor": {"description": {"english": "Index Shade", "french": "Couleur d'index"}, +"indexbgcolor": {"description": {"en": "Index Shade", "fr": "Couleur d'index"}, "type": "color", "default": {"default": "D1E4AE"} }, -"titleprefixwords": {"description": {"english": "Ignore some words in the beginning of song titles", - "french": "Ignore des mots dans le classement des chansons"}, +"titleprefixwords": {"description": {"en": "Ignore some words in the beginning of song titles", + "fr": "Ignore des mots dans le classement des chansons"}, "default": {"default": ["The", "Le", "La", "L'", "A", "Au", "Ces", "De", "Des", "El", "Les", "Ma", "Mon", "Un"]} } diff --git a/patacrep/data/templates/songs.tex b/patacrep/data/templates/songs.tex index 741b5d39..6a070fe8 100644 --- a/patacrep/data/templates/songs.tex +++ b/patacrep/data/templates/songs.tex @@ -20,46 +20,46 @@ (* variables *) { -"instruments": {"description": {"english": "Instruments", "french": "Instruments"}, +"instruments": {"description": {"en": "Instruments", "fr": "Instruments"}, "type": "flag", - "values": {"guitar": {"english": "Guitare", "french": "Guitare"}, - "ukulele": {"english": "Ukulele", "french": "Ukulele"} + "values": {"guitar": {"en": "Guitare", "fr": "Guitare"}, + "ukulele": {"en": "Ukulele", "fr": "Ukulele"} }, "join": ",", "mandatory": true, "default": {"default":["guitar"]} }, -"bookoptions": {"description": {"english": "Options", "french": "Options"}, +"bookoptions": {"description": {"en": "Options", "fr": "Options"}, "type": "flag", - "values": {"diagram": {"english": "Chords diagrams", "french": "Diagrammes d'accords"}, - "importantdiagramonly": {"english": "Only importants diagrames", "french": "Diagrammes importants uniquement"}, - "lilypond": {"english": "Lilypond music sheets", "french": "Partitions lilypond"}, - "pictures": {"english": "Cover pictures", "french": "Couvertures d'albums"}, - "tabs": {"english": "Tablatures", "french": "Tablatures"}, - "repeatchords": {"english": "Repeat chords", "french": "Répéter les accords"}, - "onesongperpage": {"english": "One song per page", "french": "Une chanson par page"} + "values": {"diagram": {"en": "Chords diagrams", "fr": "Diagrammes d'accords"}, + "importantdiagramonly": {"en": "Only importants diagrames", "fr": "Diagrammes importants uniquement"}, + "lilypond": {"en": "Lilypond music sheets", "fr": "Partitions lilypond"}, + "pictures": {"en": "Cover pictures", "fr": "Couvertures d'albums"}, + "tabs": {"en": "Tablatures", "fr": "Tablatures"}, + "repeatchords": {"en": "Repeat chords", "fr": "Répéter les accords"}, + "onesongperpage": {"en": "One song per page", "fr": "Une chanson par page"} }, "join": ",", "mandatory": true, "default": {"default":["diagram","pictures"]} }, -"booktype": {"description": {"english": "Type", "french": "Type"}, +"booktype": {"description": {"en": "Type", "fr": "Type"}, "type": "enum", - "values": {"chorded": {"english": "With guitar chords", "french": "Avec accords de guitare" }, - "lyric": {"english": "Lyrics only", "french": "Paroles uniquement"} + "values": {"chorded": {"en": "With guitar chords", "fr": "Avec accords de guitare" }, + "lyric": {"en": "Lyrics only", "fr": "Paroles uniquement"} }, "default": {"default":"chorded"}, "mandatory": true }, -"lang": {"description": {"english": "Language", "french": "Langue"}, - "default": {"english": "en", "french": "fr"} +"lang": {"description": {"en": "Language", "fr": "Langue"}, + "default": {"en": "en", "fr": "fr"} }, -"titleprefixwords": {"description": {"english": "Ignore some words in the beginning of song titles", - "french": "Ignore des mots dans le classement des chansons"}, +"titleprefixwords": {"description": {"en": "Ignore some words in the beginning of song titles", + "fr": "Ignore des mots dans le classement des chansons"}, "default": {"default": []} }, -"authwords": {"description": {"english": "Set of options to process author string (LaTeX commands authsepword, authignoreword, authbyword)", - "french": "Options pour traiter les noms d'auteurs (commandes LaTeX authsepword, authignoreword, authbyword)"}, +"authwords": {"description": {"en": "Set of options to process author string (LaTeX commands authsepword, authignoreword, authbyword)", + "fr": "Options pour traiter les noms d'auteurs (commandes LaTeX authsepword, authignoreword, authbyword)"}, "default": {"default": {}} } }