Project

General

Profile

« Previous | Next » 

Revision 70e65017

Added by Marc Dequènes over 12 years ago

  • ID 70e65017593750754038374c7fab3b153ba60b5d

[fix] renamed 'technique' into more appropriate name 'artwork_support', and update schema and translations (Closes #4)

View differences:

app/controllers/admin/artwork_supports_controller.rb
1
class Admin::ArtworkSupportsController < Admin::AdminController
2
  simple_rest_support
3
end
app/controllers/admin/artworks_controller.rb
10 10
    @artwork_materials = ArtworkMaterial.find(:all, :order => "name ASC")
11 11
    @artwork_conditions = ArtworkCondition.find(:all, :order => "position ASC")
12 12
    @artwork_placement_reasons = ArtworkPlacementReason.find(:all, :order => "name ASC")
13
    @techniques = Technique.find(:all, :order => "name ASC")
13
    @artwork_supports = ArtworkSupport.find(:all, :order => "name ASC")
14 14
  end
15 15
end
app/controllers/admin/techniques_controller.rb
1
class Admin::TechniquesController < Admin::AdminController
2
  simple_rest_support
3
end
app/models/artwork.rb
6 6
  belongs_to :artwork_condition
7 7
  belongs_to :artwork_placement_reason
8 8
  has_many :artwork_step_images, :order => "date ASC"
9
  has_and_belongs_to_many :techniques, :order => "name ASC"
9
  has_and_belongs_to_many :artwork_supports, :order => "name ASC"
10 10

  
11 11
  validates_presence_of :title, :artwork_material_id, :artwork_size_id, :artwork_condition_id
12 12
  validates_uniqueness_of :title
app/models/artwork_support.rb
1
class ArtworkSupport < ActiveRecord::Base
2
  has_and_belongs_to_many :artworks, :order => "title ASC"
3

  
4
  validates_presence_of :name
5
  validates_uniqueness_of :name
6
  validates_uniqueness_of :acronym, :allow_nil => true
7
  validates_length_of :name, :within => 1..128, :allow_blank => true
8
  validates_length_of :acronym, :within => 1..8, :allow_blank => true
9
end
app/models/technique.rb
1
class Technique < ActiveRecord::Base
2
  has_and_belongs_to_many :artworks, :order => "title ASC"
3

  
4
  validates_presence_of :name
5
  validates_uniqueness_of :name
6
  validates_uniqueness_of :acronym, :allow_nil => true
7
  validates_length_of :name, :within => 1..128, :allow_blank => true
8
  validates_length_of :acronym, :within => 1..8, :allow_blank => true
9
end
app/views/admin/artwork_supports/_form.rhtml
1
<p>
2
<%
3
form_for_resource do |f|
4
%>
5
<%=
6
stacking_form(f) do |table|
7
  table.field :name, _("Name:"), :text_field
8
  table.field :acronym, _("Acronym:"), :text_field, :size => 4
9
  table.content display_standard_form_buttons(submit_label)
10
end
11
%>
12
<%
13
end
14
%>
15
</p>
app/views/admin/artwork_supports/edit.rhtml
1
<h2><%= _("Modify Artwork Support") %></h2>
2

  
3
<%= error_messages_for_resource %>
4

  
5
<%= render :partial => "form", :locals => {:submit_label => _("Modify")} %>
app/views/admin/artwork_supports/index.rhtml
1
<h2><%= _("List of Artwork Supports") %></h2>
2

  
3
<p>
4
  <table>
5
    <tr><th><%= _("Name") %></th><th><%= _("Acronym") %></th><th><%= _("Actions") %></th></tr>
6
    <% resource_model.find(:all, :order => "name ASC").each do |artwork_support| %>
7
    <tr><td><%= artwork_support.name %></td><td><%= artwork_support.acronym %></td><td class="actions"><%= display_standard_item_actions(artwork_support) %></td></tr>
8
    <% end %>
9
  </table>
10
  <%= display_new_action %>
11
</p>
app/views/admin/artwork_supports/new.rhtml
1
<h2><%= _("New Artwork Support") %></h2>
2

  
3
<%= error_messages_for_resource %>
4

  
5
<%= render :partial => "form", :locals => {:submit_label => _("Add")} %>
app/views/admin/artwork_supports/show.rhtml
1
<h2><%= sprintf(_("Artwork Support \#%u"), @artwork_support.id) %></h2>
2

  
3
<p>
4
<%=
5
stacking_table do |table|
6
  table.content [_("Name:"), @artwork_support.name]
7
  table.content [_("Acronym:"), @artwork_support.acronym]
8
end
9
%>
10
<%= display_standard_item_actions %>
11
</p>
12
<p><%= link_to_resource_index _("Display all artwork supports") %></p>
app/views/admin/artworks/_form.rhtml
26 26
    cat.custom_field :artwork_size_id,  _("Size:"),
27 27
      render(:partial => 'admin/artwork_sizes/selector', :locals => {:form_object => resource_name, :form_field => "artwork_size_id", :selected => selected_artwork_size_id})
28 28
    cat.field :artwork_material_id, _("Material:"), :collection_select, @artwork_materials, :id, :name
29
    cat.field :technique_ids, _("Techniques"), :collection_select, @techniques, :id, :name, {:include_blank => true}, {:multiple => true, :size => [@techniques.size + 1, 10].min}
29
    cat.field :artwork_support_ids, _("Supports"), :collection_select, @artwork_supports, :id, :name, {:include_blank => true}, {:multiple => true, :size => [@artwork_supports.size + 1, 10].min}
30 30
  end
31 31
  table.category _("Result") do |cat|
32 32
    cat.field :artwork_condition_id, _("Condition:"), :collection_select, @artwork_conditions, :id, :name
app/views/admin/artworks/show.rhtml
27 27
  cat.content [_("Set / Group:"), text]
28 28
  cat.content [_("Size:"), @artwork.artwork_size.human_size]
29 29
  cat.content [_("Material:"), @artwork.artwork_material.name]
30
  cat.content [_("Techniques:"), display_list(@artwork.techniques.collect{|t| t.name})]
30
  cat.content [_("Supports:"), display_list(@artwork.artwork_supports.collect{|t| t.name})]
31 31
  end
32 32
  table.category _("Result") do |cat|
33 33
    cat.content [_("Condition:"), @artwork.artwork_condition.name]
app/views/admin/techniques/_form.rhtml
1
<p>
2
<%
3
form_for_resource do |f|
4
%>
5
<%=
6
stacking_form(f) do |table|
7
  table.field :name, _("Name:"), :text_field
8
  table.field :acronym, _("Acronym:"), :text_field, :size => 4
9
  table.content display_standard_form_buttons(submit_label)
10
end
11
%>
12
<%
13
end
14
%>
15
</p>
app/views/admin/techniques/edit.rhtml
1
<h2><%= _("Modify Technique") %></h2>
2

  
3
<%= error_messages_for_resource %>
4

  
5
<%= render :partial => "form", :locals => {:submit_label => _("Modify")} %>
app/views/admin/techniques/index.rhtml
1
<h2><%= _("List of Techniques") %></h2>
2

  
3
<p>
4
  <table>
5
    <tr><th><%= _("Name") %></th><th><%= _("Acronym") %></th><th><%= _("Actions") %></th></tr>
6
    <% resource_model.find(:all, :order => "name ASC").each do |technique| %>
7
    <tr><td><%= technique.name %></td><td><%= technique.acronym %></td><td class="actions"><%= display_standard_item_actions(technique) %></td></tr>
8
    <% end %>
9
  </table>
10
  <%= display_new_action %>
11
</p>
app/views/admin/techniques/new.rhtml
1
<h2><%= _("New Technique") %></h2>
2

  
3
<%= error_messages_for_resource %>
4

  
5
<%= render :partial => "form", :locals => {:submit_label => _("Add")} %>
app/views/admin/techniques/show.rhtml
1
<h2><%= sprintf(_("Technique \#%u"), @technique.id) %></h2>
2

  
3
<p>
4
<%=
5
stacking_table do |table|
6
  table.content [_("Name:"), @technique.name]
7
  table.content [_("Acronym:"), @technique.acronym]
8
end
9
%>
10
<%= display_standard_item_actions %>
11
</p>
12
<p><%= link_to_resource_index _("Display all techniques") %></p>
app/views/layouts/application.rhtml
29 29
						<li><%= link_to _("Manage Artwork Placement Reasons"), admin_artwork_placement_reasons_url %></li>
30 30
						<li><%= link_to _("Manage Artwork Sets & Groups"), admin_artwork_sets_url %></li>
31 31
						<li><%= link_to _("Manage Artwork Sizes"), admin_artwork_sizes_url %></li>
32
						<li><%= link_to _("Manage Techniques"), admin_techniques_url %></li>
32
						<li><%= link_to _("Manage Artwork Supports"), admin_artwork_supports_url %></li>
33 33
<% if current_user.admin %>
34 34
						<li>-------</li>
35 35
						<li><%= link_to _("Manage Users"), admin_users_url %></li>
config/routes.rb
29 29

  
30 30
  # See how all your routes lay out with "rake routes"
31 31
  map.namespace :admin do |admin|
32
    admin.resources :artwork_sizes, :artwork_materials, :artwork_placement_reasons, :techniques
32
    admin.resources :artwork_sizes, :artwork_materials, :artwork_placement_reasons, :artwork_supports
33 33
    admin.resources :artwork_conditions, :member => {:move => :put}
34 34
    admin.resources :artwork_sets, :has_many => [ :artwork_groups ]
35 35
    admin.resources :artworks, :has_many => [ :artwork_step_images ]
db/schema.rb
78 78

  
79 79
  add_index "artwork_steps", ["filename"], :name => "image_filename", :unique => true
80 80

  
81
  create_table "artwork_supports", :force => true do |t|
82
    t.string "name",    :limit => 128, :null => false
83
    t.string "acronym", :limit => 8
84
  end
85

  
86
  add_index "artwork_supports", ["name", "acronym"], :name => "nom", :unique => true
87
  add_index "artwork_supports", ["name"], :name => "nom_2"
88

  
89
  create_table "artwork_supports_artworks", :force => true do |t|
90
    t.integer "artwork_support_id", :limit => 10, :null => false
91
    t.integer "artwork_id",         :limit => 20, :null => false
92
  end
93

  
94
  add_index "artwork_supports_artworks", ["artwork_support_id", "artwork_id"], :name => "artwork_support_id", :unique => true
95

  
81 96
  create_table "artworks", :force => true do |t|
82 97
    t.integer  "artwork_set_id",              :limit => 20
83 98
    t.string   "artwork_set_position",        :limit => 32
......
95 110
    t.datetime "updated_at"
96 111
  end
97 112

  
98
  create_table "artworks_techniques", :force => true do |t|
99
    t.integer "technique_id", :limit => 10, :null => false
100
    t.integer "artwork_id",   :limit => 20, :null => false
101
  end
102

  
103
  add_index "artworks_techniques", ["technique_id", "artwork_id"], :name => "technique_id", :unique => true
104

  
105 113
  create_table "exhibition_artwork", :force => true do |t|
106 114
    t.integer "exhibition_id", :limit => 20, :null => false
107 115
    t.integer "artwork_id",    :limit => 20, :null => false
......
123 131
  add_index "exhibitions", ["name"], :name => "nom", :unique => true
124 132
  add_index "exhibitions", ["name"], :name => "nom_2"
125 133

  
126
  create_table "techniques", :force => true do |t|
127
    t.string "name",    :limit => 128, :null => false
128
    t.string "acronym", :limit => 8
129
  end
130

  
131
  add_index "techniques", ["name", "acronym"], :name => "nom", :unique => true
132
  add_index "techniques", ["name"], :name => "nom_2"
133

  
134 134
  create_table "users", :force => true do |t|
135 135
    t.string   "login",           :limit => 64,                     :null => false
136 136
    t.string   "real_name",       :limit => 256
po/MyCyma.pot
7 7
msgid ""
8 8
msgstr ""
9 9
"Project-Id-Version: MyCyma 0.1.0\n"
10
"POT-Creation-Date: 2008-11-28 00:31+0100\n"
10
"POT-Creation-Date: 2009-02-28 14:12+0100\n"
11 11
"PO-Revision-Date: 2008-07-28 02:17+0200\n"
12 12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13
"Language-Team: LANGUAGE <LL@li.org>\n"
......
16 16
"Content-Transfer-Encoding: 8bit\n"
17 17
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
18 18

  
19
#: app/models/technique.rb:-
20
msgid "technique"
21
msgstr ""
22

  
23
#: app/models/technique.rb:-
24
msgid "Technique|Name"
25
msgstr ""
26

  
27
#: app/models/technique.rb:-
28
msgid "Technique|Acronym"
29
msgstr ""
30

  
31 19
#: app/models/artwork.rb:-
32 20
msgid "artwork"
33 21
msgstr ""
......
256 244
msgid "ArtworkStep|Comment"
257 245
msgstr ""
258 246

  
247
#: app/models/artwork_support.rb:-
248
msgid "artwork support"
249
msgstr ""
250

  
251
#: app/models/artwork_support.rb:-
252
msgid "ArtworkSupport|Name"
253
msgstr ""
254

  
255
#: app/models/artwork_support.rb:-
256
msgid "ArtworkSupport|Acronym"
257
msgstr ""
258

  
259 259
#: app/models/artwork_size.rb:-
260 260
msgid "artwork size"
261 261
msgstr ""
......
280 280
msgid "is invalid, because this (height, width) couple already exist"
281 281
msgstr ""
282 282

  
283
#: app/helpers/application_helper.rb:86
283
#: app/helpers/application_helper.rb:87
284 284
#: app/views/admin/artwork_step_images/edit.rhtml:5
285
#: app/views/admin/users/edit.rhtml:5
286
#: app/views/admin/artwork_supports/edit.rhtml:5
285 287
#: app/views/admin/artwork_placement_reasons/edit.rhtml:5
286 288
#: app/views/admin/artwork_materials/edit.rhtml:5
287
#: app/views/admin/techniques/edit.rhtml:5
288 289
#: app/views/admin/artwork_conditions/edit.rhtml:5
289 290
#: app/views/admin/artwork_sets/edit.rhtml:5
290 291
#: app/views/admin/artwork_sizes/edit.rhtml:5
......
293 294
msgid "Modify"
294 295
msgstr ""
295 296

  
296
#: app/helpers/application_helper.rb:87
297
#: app/helpers/application_helper.rb:92
297 298
msgid "Delete"
298 299
msgstr ""
299 300

  
300
#: app/helpers/application_helper.rb:87
301
#: app/helpers/application_helper.rb:92
301 302
msgid "Are you sure?"
302 303
msgstr ""
303 304

  
304
#: app/helpers/application_helper.rb:105
305
#: app/helpers/application_helper.rb:113
305 306
msgid "Move to top"
306 307
msgstr ""
307 308

  
308
#: app/helpers/application_helper.rb:106
309
#: app/helpers/application_helper.rb:114
309 310
msgid "Move up"
310 311
msgstr ""
311 312

  
312
#: app/helpers/application_helper.rb:111
313
#: app/helpers/application_helper.rb:119
313 314
msgid "Move down"
314 315
msgstr ""
315 316

  
316
#: app/helpers/application_helper.rb:112
317
#: app/helpers/application_helper.rb:120
317 318
msgid "Move to bottom"
318 319
msgstr ""
319 320

  
320
#: app/helpers/application_helper.rb:118
321
#: app/helpers/application_helper.rb:126
321 322
msgid "New %s"
322 323
msgstr ""
323 324

  
324
#: app/helpers/application_helper.rb:128
325
#: app/helpers/application_helper.rb:136
325 326
msgid "Cancel"
326 327
msgstr ""
327 328

  
328
#: app/helpers/application_helper.rb:142
329
#: app/helpers/application_helper.rb:150
329 330
msgid "Alert !"
330 331
msgstr ""
331 332

  
332
#: app/helpers/application_helper.rb:177
333
#: app/helpers/application_helper.rb:185
333 334
#: app/views/admin/artwork_sizes/index.rhtml:7
334 335
msgid "Yes"
335 336
msgstr ""
336 337

  
337
#: app/helpers/application_helper.rb:177
338
#: app/helpers/application_helper.rb:185
338 339
#: app/views/admin/artwork_sizes/index.rhtml:7
339 340
msgid "No"
340 341
msgstr ""
341 342

  
342
#: app/helpers/application_helper.rb:198 app/helpers/application_helper.rb:202
343
#: app/helpers/application_helper.rb:206 app/helpers/application_helper.rb:210
343 344
msgid "Comment:"
344 345
msgstr ""
345 346

  
346
#: app/helpers/application_helper.rb:198
347
#: app/helpers/application_helper.rb:206
347 348
msgid "<br/>(with %s<br/>formating)"
348 349
msgstr ""
349 350

  
350
#: app/helpers/application_helper.rb:206
351
#: app/helpers/application_helper.rb:214
351 352
msgid "Created at:"
352 353
msgstr ""
353 354

  
354
#: app/helpers/application_helper.rb:207
355
#: app/helpers/application_helper.rb:215
355 356
msgid "Updated at:"
356 357
msgstr ""
357 358

  
358
#: app/controllers/application.rb:40
359
#: app/controllers/application.rb:39
359 360
msgid "Please login to continue"
360 361
msgstr ""
361 362

  
......
410 411
msgstr ""
411 412

  
412 413
#: app/views/layouts/application.rhtml:32
413
msgid "Manage Techniques"
414
msgid "Manage Artwork Supports"
414 415
msgstr ""
415 416

  
416 417
#: app/views/layouts/application.rhtml:35
......
426 427
msgstr ""
427 428

  
428 429
#: app/views/layouts/application.rhtml:43
429
msgid "Help"
430
msgid "Author site"
430 431
msgstr ""
431 432

  
432 433
#: app/views/layouts/application.rhtml:48
......
442 443
msgstr ""
443 444

  
444 445
#: app/views/admin/artwork_step_images/new.rhtml:5
446
#: app/views/admin/users/new.rhtml:5
447
#: app/views/admin/artwork_supports/new.rhtml:5
445 448
#: app/views/admin/artwork_placement_reasons/new.rhtml:5
446 449
#: app/views/admin/artwork_materials/new.rhtml:5
447
#: app/views/admin/techniques/new.rhtml:5
448 450
#: app/views/admin/artwork_conditions/new.rhtml:5
449 451
#: app/views/admin/artwork_sets/new.rhtml:5
450 452
#: app/views/admin/artwork_sizes/new.rhtml:5
......
477 479
msgstr ""
478 480

  
479 481
#: app/views/admin/artwork_step_images/index.rhtml:17
482
#: app/views/admin/users/index.rhtml:9
483
#: app/views/admin/artwork_supports/index.rhtml:5
480 484
#: app/views/admin/artwork_placement_reasons/index.rhtml:5
481 485
#: app/views/admin/artwork_materials/index.rhtml:5
482
#: app/views/admin/techniques/index.rhtml:5
483 486
#: app/views/admin/artwork_conditions/index.rhtml:5
484 487
#: app/views/admin/artwork_sets/index.rhtml:5
485 488
#: app/views/admin/artwork_sizes/index.rhtml:5
......
548 551
msgid "Modify Artwork Step"
549 552
msgstr ""
550 553

  
554
#: app/views/admin/users/new.rhtml:1
555
msgid "New User"
556
msgstr ""
557

  
551 558
#: app/views/admin/users/index.rhtml:1
552
msgid "Not implemented yet !"
559
msgid "List of users"
553 560
msgstr ""
554 561

  
555
#: app/views/admin/artwork_placement_reasons/new.rhtml:1
556
msgid "New Artwork Placement Reason"
562
#: app/views/admin/users/index.rhtml:6 app/views/admin/users/_form.rhtml:11
563
msgid "Login"
557 564
msgstr ""
558 565

  
559
#: app/views/admin/artwork_placement_reasons/index.rhtml:1
560
msgid "List of Artwork Placement Reasons"
566
#: app/views/admin/users/index.rhtml:7 app/views/admin/users/_form.rhtml:12
567
msgid "Real Name"
568
msgstr ""
569

  
570
#: app/views/admin/users/index.rhtml:8 app/views/admin/users/_form.rhtml:13
571
msgid "eMail"
572
msgstr ""
573

  
574
#: app/views/admin/users/show.rhtml:1
575
msgid "User '%s'"
576
msgstr ""
577

  
578
#: app/views/admin/users/show.rhtml:6
579
msgid "Login:"
580
msgstr ""
581

  
582
#: app/views/admin/users/show.rhtml:7
583
msgid "Real Name:"
584
msgstr ""
585

  
586
#: app/views/admin/users/show.rhtml:8
587
msgid "Email:"
588
msgstr ""
589

  
590
#: app/views/admin/users/show.rhtml:9 app/views/admin/users/_form.rhtml:14
591
msgid "Administrator?"
592
msgstr ""
593

  
594
#: app/views/admin/users/show.rhtml:10
595
msgid "Entry Status"
596
msgstr ""
597

  
598
#: app/views/admin/users/show.rhtml:11
599
msgid "First Created:"
600
msgstr ""
601

  
602
#: app/views/admin/users/show.rhtml:12
603
msgid "Last Updated:"
604
msgstr ""
605

  
606
#: app/views/admin/users/show.rhtml:18
607
msgid "Display all users"
608
msgstr ""
609

  
610
#: app/views/admin/users/_form.rhtml:15
611
msgid "Password"
612
msgstr ""
613

  
614
#: app/views/admin/users/_form.rhtml:16
615
msgid "Password (confirmation)"
561 616
msgstr ""
562 617

  
618
#: app/views/admin/users/edit.rhtml:1
619
msgid "Modify User"
620
msgstr ""
621

  
622
#: app/views/admin/artwork_supports/new.rhtml:1
623
msgid "New Artwork Support"
624
msgstr ""
625

  
626
#: app/views/admin/artwork_supports/index.rhtml:1
627
msgid "List of Artwork Supports"
628
msgstr ""
629

  
630
#: app/views/admin/artwork_supports/index.rhtml:5
563 631
#: app/views/admin/artwork_placement_reasons/index.rhtml:5
564 632
#: app/views/admin/artwork_materials/index.rhtml:5
565
#: app/views/admin/techniques/index.rhtml:5
566 633
#: app/views/admin/artwork_conditions/index.rhtml:5
567 634
#: app/views/admin/artwork_sets/index.rhtml:5
568 635
#: app/views/admin/artwork_groups/index.rhtml:5
569 636
msgid "Name"
570 637
msgstr ""
571 638

  
572
#: app/views/admin/artwork_placement_reasons/show.rhtml:1
573
msgid "Artwork Placement Reason #%u"
639
#: app/views/admin/artwork_supports/index.rhtml:5
640
msgid "Acronym"
574 641
msgstr ""
575 642

  
643
#: app/views/admin/artwork_supports/show.rhtml:1
644
msgid "Artwork Support #%u"
645
msgstr ""
646

  
647
#: app/views/admin/artwork_supports/show.rhtml:6
648
#: app/views/admin/artwork_supports/_form.rhtml:7
576 649
#: app/views/admin/artwork_placement_reasons/show.rhtml:6
577 650
#: app/views/admin/artwork_placement_reasons/_form.rhtml:7
578 651
#: app/views/admin/artwork_materials/show.rhtml:6
579 652
#: app/views/admin/artwork_materials/_form.rhtml:7
580
#: app/views/admin/techniques/show.rhtml:6
581
#: app/views/admin/techniques/_form.rhtml:7
582 653
#: app/views/admin/artwork_conditions/show.rhtml:6
583 654
#: app/views/admin/artwork_conditions/_form.rhtml:7
584 655
#: app/views/admin/artwork_sets/show.rhtml:6
......
588 659
msgid "Name:"
589 660
msgstr ""
590 661

  
662
#: app/views/admin/artwork_supports/show.rhtml:7
663
#: app/views/admin/artwork_supports/_form.rhtml:8
664
msgid "Acronym:"
665
msgstr ""
666

  
667
#: app/views/admin/artwork_supports/show.rhtml:12
668
msgid "Display all artwork supports"
669
msgstr ""
670

  
671
#: app/views/admin/artwork_supports/edit.rhtml:1
672
msgid "Modify Artwork Support"
673
msgstr ""
674

  
675
#: app/views/admin/artwork_placement_reasons/new.rhtml:1
676
msgid "New Artwork Placement Reason"
677
msgstr ""
678

  
679
#: app/views/admin/artwork_placement_reasons/index.rhtml:1
680
msgid "List of Artwork Placement Reasons"
681
msgstr ""
682

  
683
#: app/views/admin/artwork_placement_reasons/show.rhtml:1
684
msgid "Artwork Placement Reason #%u"
685
msgstr ""
686

  
591 687
#: app/views/admin/artwork_placement_reasons/show.rhtml:11
592 688
#: app/views/admin/artwork_materials/show.rhtml:11
593 689
msgid "Display all artwork materials"
......
613 709
msgid "Modify Artwork Material"
614 710
msgstr ""
615 711

  
616
#: app/views/admin/techniques/new.rhtml:1
617
msgid "New Technique"
618
msgstr ""
619

  
620
#: app/views/admin/techniques/index.rhtml:1
621
msgid "List of Techniques"
622
msgstr ""
623

  
624
#: app/views/admin/techniques/index.rhtml:5
625
msgid "Acronym"
626
msgstr ""
627

  
628
#: app/views/admin/techniques/show.rhtml:1
629
msgid "Technique #%u"
630
msgstr ""
631

  
632
#: app/views/admin/techniques/show.rhtml:7
633
#: app/views/admin/techniques/_form.rhtml:8
634
msgid "Acronym:"
635
msgstr ""
636

  
637
#: app/views/admin/techniques/show.rhtml:12
638
msgid "Display all techniques"
639
msgstr ""
640

  
641
#: app/views/admin/techniques/edit.rhtml:1
642
msgid "Modify Technique"
643
msgstr ""
644

  
645 712
#: app/views/admin/artwork_conditions/new.rhtml:1
646 713
msgid "New Artwork Condition"
647 714
msgstr ""
......
796 863
msgstr ""
797 864

  
798 865
#: app/views/admin/artworks/show.rhtml:30
799
msgid "Techniques:"
866
msgid "Supports:"
800 867
msgstr ""
801 868

  
802 869
#: app/views/admin/artworks/show.rhtml:32
......
853 920
msgstr ""
854 921

  
855 922
#: app/views/admin/artworks/_form.rhtml:29
856
msgid "Techniques"
923
msgid "Supports"
857 924
msgstr ""
858 925

  
859 926
#: app/views/admin/artworks/edit.rhtml:1
po/fr/MyCyma.po
7 7
msgid ""
8 8
msgstr ""
9 9
"Project-Id-Version: MyCyma 0.1.0\n"
10
"POT-Creation-Date: 2008-11-28 00:31+0100\n"
10
"POT-Creation-Date: 2009-02-28 14:12+0100\n"
11 11
"PO-Revision-Date: 2008-07-28 02:17+0200\n"
12 12
"Last-Translator: Marc Dequènes (Duck) <Duck@DuckCorp.org>\n"
13 13
"MIME-Version: 1.0\n"
......
15 15
"Content-Transfer-Encoding: 8bit\n"
16 16
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
17 17

  
18
#: app/models/technique.rb:-
19
msgid "technique"
20
msgstr "technique"
21

  
22
#: app/models/technique.rb:-
23
msgid "Technique|Name"
24
msgstr "Technique|Nom"
25

  
26
#: app/models/technique.rb:-
27
msgid "Technique|Acronym"
28
msgstr "Technique|Acronyme"
29

  
30 18
#: app/models/artwork.rb:-
31 19
msgid "artwork"
32 20
msgstr "œuvre"
......
255 243
msgid "ArtworkStep|Comment"
256 244
msgstr "EtapeOeuvre|Commentaire"
257 245

  
246
#: app/models/artwork_support.rb:-
247
msgid "artwork support"
248
msgstr "support"
249

  
250
#: app/models/artwork_support.rb:-
251
msgid "ArtworkSupport|Name"
252
msgstr "Support|Nom"
253

  
254
#: app/models/artwork_support.rb:-
255
msgid "ArtworkSupport|Acronym"
256
msgstr "Support|Acronyme"
257

  
258 258
#: app/models/artwork_size.rb:-
259 259
msgid "artwork size"
260 260
msgstr "dimension de l'œuvre"
......
279 279
msgid "is invalid, because this (height, width) couple already exist"
280 280
msgstr "est invalide, car ce couple (hauteur, largeur) existe déjà"
281 281

  
282
#: app/helpers/application_helper.rb:86
282
#: app/helpers/application_helper.rb:87
283 283
#: app/views/admin/artwork_step_images/edit.rhtml:5
284
#: app/views/admin/users/edit.rhtml:5
285
#: app/views/admin/artwork_supports/edit.rhtml:5
284 286
#: app/views/admin/artwork_placement_reasons/edit.rhtml:5
285 287
#: app/views/admin/artwork_materials/edit.rhtml:5
286
#: app/views/admin/techniques/edit.rhtml:5
287 288
#: app/views/admin/artwork_conditions/edit.rhtml:5
288 289
#: app/views/admin/artwork_sets/edit.rhtml:5
289 290
#: app/views/admin/artwork_sizes/edit.rhtml:5
......
292 293
msgid "Modify"
293 294
msgstr "Modifier"
294 295

  
295
#: app/helpers/application_helper.rb:87
296
#: app/helpers/application_helper.rb:92
296 297
msgid "Delete"
297 298
msgstr "Supprimer"
298 299

  
299
#: app/helpers/application_helper.rb:87
300
#: app/helpers/application_helper.rb:92
300 301
msgid "Are you sure?"
301 302
msgstr "Êtes vous sûr ?"
302 303

  
303
#: app/helpers/application_helper.rb:105
304
#: app/helpers/application_helper.rb:113
304 305
msgid "Move to top"
305 306
msgstr "Placer en premier"
306 307

  
307
#: app/helpers/application_helper.rb:106
308
#: app/helpers/application_helper.rb:114
308 309
msgid "Move up"
309 310
msgstr "Placer plus haut"
310 311

  
311
#: app/helpers/application_helper.rb:111
312
#: app/helpers/application_helper.rb:119
312 313
msgid "Move down"
313 314
msgstr "Placer plus bas"
314 315

  
315
#: app/helpers/application_helper.rb:112
316
#: app/helpers/application_helper.rb:120
316 317
msgid "Move to bottom"
317 318
msgstr "Placer en dernier"
318 319

  
319
#: app/helpers/application_helper.rb:118
320
#: app/helpers/application_helper.rb:126
320 321
msgid "New %s"
321 322
msgstr "Nouveau/Nouvelle %s"
322 323

  
323
#: app/helpers/application_helper.rb:128
324
#: app/helpers/application_helper.rb:136
324 325
msgid "Cancel"
325 326
msgstr "Annuler"
326 327

  
327
#: app/helpers/application_helper.rb:142
328
#: app/helpers/application_helper.rb:150
328 329
msgid "Alert !"
329 330
msgstr "Alerte !"
330 331

  
331
#: app/helpers/application_helper.rb:177
332
#: app/helpers/application_helper.rb:185
332 333
#: app/views/admin/artwork_sizes/index.rhtml:7
333 334
msgid "Yes"
334 335
msgstr "Oui"
335 336

  
336
#: app/helpers/application_helper.rb:177
337
#: app/helpers/application_helper.rb:185
337 338
#: app/views/admin/artwork_sizes/index.rhtml:7
338 339
msgid "No"
339 340
msgstr "Non"
340 341

  
341
#: app/helpers/application_helper.rb:198 app/helpers/application_helper.rb:202
342
#: app/helpers/application_helper.rb:206 app/helpers/application_helper.rb:210
342 343
msgid "Comment:"
343 344
msgstr "Commentaire :"
344 345

  
345
#: app/helpers/application_helper.rb:198
346
#: app/helpers/application_helper.rb:206
346 347
msgid "<br/>(with %s<br/>formating)"
347 348
msgstr "<br/>(avec du<br/> formatage %s)"
348 349

  
349
#: app/helpers/application_helper.rb:206
350
#: app/helpers/application_helper.rb:214
350 351
msgid "Created at:"
351 352
msgstr "Créé(e) le :"
352 353

  
353
#: app/helpers/application_helper.rb:207
354
#: app/helpers/application_helper.rb:215
354 355
msgid "Updated at:"
355 356
msgstr "Mis(e) à jour le :"
356 357

  
357
#: app/controllers/application.rb:40
358
#: app/controllers/application.rb:39
358 359
msgid "Please login to continue"
359 360
msgstr "Veuillez vous identifier pour continuer"
360 361

  
......
412 413
msgstr "Gérer les Dimensions des Œuvres"
413 414

  
414 415
#: app/views/layouts/application.rhtml:32
415
msgid "Manage Techniques"
416
msgstr "Gérer les Techniques"
416
msgid "Manage Artwork Supports"
417
msgstr "Gérer les Supports"
417 418

  
418 419
#: app/views/layouts/application.rhtml:35
419 420
msgid "Manage Users"
......
428 429
msgstr "Page du Projet"
429 430

  
430 431
#: app/views/layouts/application.rhtml:43
431
msgid "Help"
432
msgstr "Aide"
432
msgid "Author site"
433
msgstr "Site de l'auteur"
433 434

  
434 435
#: app/views/layouts/application.rhtml:48
435 436
msgid "Loggued in as '%s'"
......
444 445
msgstr "Nouvelle Étape de l'Œuvre"
445 446

  
446 447
#: app/views/admin/artwork_step_images/new.rhtml:5
448
#: app/views/admin/users/new.rhtml:5
449
#: app/views/admin/artwork_supports/new.rhtml:5
447 450
#: app/views/admin/artwork_placement_reasons/new.rhtml:5
448 451
#: app/views/admin/artwork_materials/new.rhtml:5
449
#: app/views/admin/techniques/new.rhtml:5
450 452
#: app/views/admin/artwork_conditions/new.rhtml:5
451 453
#: app/views/admin/artwork_sets/new.rhtml:5
452 454
#: app/views/admin/artwork_sizes/new.rhtml:5
......
479 481
msgstr "Prévisualisation"
480 482

  
481 483
#: app/views/admin/artwork_step_images/index.rhtml:17
484
#: app/views/admin/users/index.rhtml:9
485
#: app/views/admin/artwork_supports/index.rhtml:5
482 486
#: app/views/admin/artwork_placement_reasons/index.rhtml:5
483 487
#: app/views/admin/artwork_materials/index.rhtml:5
484
#: app/views/admin/techniques/index.rhtml:5
485 488
#: app/views/admin/artwork_conditions/index.rhtml:5
486 489
#: app/views/admin/artwork_sets/index.rhtml:5
487 490
#: app/views/admin/artwork_sizes/index.rhtml:5
......
550 553
msgid "Modify Artwork Step"
551 554
msgstr "Modifier l'Étape de l'Œuvre"
552 555

  
556
#: app/views/admin/users/new.rhtml:1
557
msgid "New User"
558
msgstr "Nouvel Utilisateur"
559

  
553 560
#: app/views/admin/users/index.rhtml:1
554
msgid "Not implemented yet !"
555
msgstr "Pas encore implémenté !"
561
msgid "List of users"
562
msgstr "Liste des utilisateurs"
556 563

  
557
#: app/views/admin/artwork_placement_reasons/new.rhtml:1
558
msgid "New Artwork Placement Reason"
559
msgstr "Nouvelle Raison de Placement d'une Œuvre"
564
#: app/views/admin/users/index.rhtml:6 app/views/admin/users/_form.rhtml:11
565
msgid "Login"
566
msgstr "Identifiant"
560 567

  
561
#: app/views/admin/artwork_placement_reasons/index.rhtml:1
562
msgid "List of Artwork Placement Reasons"
563
msgstr "Liste des Raisons de Placement d'une Œuvre"
568
#: app/views/admin/users/index.rhtml:7 app/views/admin/users/_form.rhtml:12
569
msgid "Real Name"
570
msgstr "Nom"
571

  
572
#: app/views/admin/users/index.rhtml:8 app/views/admin/users/_form.rhtml:13
573
msgid "eMail"
574
msgstr "eMail"
575

  
576
#: app/views/admin/users/show.rhtml:1
577
msgid "User '%s'"
578
msgstr "Utilisateur '%s'"
579

  
580
#: app/views/admin/users/show.rhtml:6
581
msgid "Login:"
582
msgstr "Identifiant :"
583

  
584
#: app/views/admin/users/show.rhtml:7
585
msgid "Real Name:"
586
msgstr "Nom :"
587

  
588
#: app/views/admin/users/show.rhtml:8
589
msgid "Email:"
590
msgstr "Email :"
591

  
592
#: app/views/admin/users/show.rhtml:9 app/views/admin/users/_form.rhtml:14
593
msgid "Administrator?"
594
msgstr "Administrateur ?"
595

  
596
#: app/views/admin/users/show.rhtml:10
597
msgid "Entry Status"
598
msgstr "État de l'entrée"
599

  
600
#: app/views/admin/users/show.rhtml:11
601
msgid "First Created:"
602
msgstr "Entrée Initialement Créée :"
603

  
604
#: app/views/admin/users/show.rhtml:12
605
msgid "Last Updated:"
606
msgstr "Entrée Dernièrement Mise à jour :"
607

  
608
#: app/views/admin/users/show.rhtml:18
609
msgid "Display all users"
610
msgstr "Afficher tous les utilisateurs"
611

  
612
#: app/views/admin/users/_form.rhtml:15
613
msgid "Password"
614
msgstr "Mot de passe"
615

  
616
#: app/views/admin/users/_form.rhtml:16
617
msgid "Password (confirmation)"
618
msgstr "Mot de passe (confirmation)"
619

  
620
#: app/views/admin/users/edit.rhtml:1
621
msgid "Modify User"
622
msgstr "Modifier l'Utilisateur"
623

  
624
#: app/views/admin/artwork_supports/new.rhtml:1
625
msgid "New Artwork Support"
626
msgstr "Nouveau Support"
564 627

  
628
#: app/views/admin/artwork_supports/index.rhtml:1
629
msgid "List of Artwork Supports"
630
msgstr "Liste des Supports"
631

  
632
#: app/views/admin/artwork_supports/index.rhtml:5
565 633
#: app/views/admin/artwork_placement_reasons/index.rhtml:5
566 634
#: app/views/admin/artwork_materials/index.rhtml:5
567
#: app/views/admin/techniques/index.rhtml:5
568 635
#: app/views/admin/artwork_conditions/index.rhtml:5
569 636
#: app/views/admin/artwork_sets/index.rhtml:5
570 637
#: app/views/admin/artwork_groups/index.rhtml:5
571 638
msgid "Name"
572 639
msgstr "Nom"
573 640

  
574
#: app/views/admin/artwork_placement_reasons/show.rhtml:1
575
msgid "Artwork Placement Reason #%u"
576
msgstr "Raison de Placement d'une Œuvre n°%u"
641
#: app/views/admin/artwork_supports/index.rhtml:5
642
msgid "Acronym"
643
msgstr "Acronyme"
644

  
645
#: app/views/admin/artwork_supports/show.rhtml:1
646
msgid "Artwork Support #%u"
647
msgstr "Support n°%u"
577 648

  
649
#: app/views/admin/artwork_supports/show.rhtml:6
650
#: app/views/admin/artwork_supports/_form.rhtml:7
578 651
#: app/views/admin/artwork_placement_reasons/show.rhtml:6
579 652
#: app/views/admin/artwork_placement_reasons/_form.rhtml:7
580 653
#: app/views/admin/artwork_materials/show.rhtml:6
581 654
#: app/views/admin/artwork_materials/_form.rhtml:7
582
#: app/views/admin/techniques/show.rhtml:6
583
#: app/views/admin/techniques/_form.rhtml:7
584 655
#: app/views/admin/artwork_conditions/show.rhtml:6
585 656
#: app/views/admin/artwork_conditions/_form.rhtml:7
586 657
#: app/views/admin/artwork_sets/show.rhtml:6
......
590 661
msgid "Name:"
591 662
msgstr "Nom :"
592 663

  
664
#: app/views/admin/artwork_supports/show.rhtml:7
665
#: app/views/admin/artwork_supports/_form.rhtml:8
666
msgid "Acronym:"
667
msgstr "Acronyme :"
668

  
669
#: app/views/admin/artwork_supports/show.rhtml:12
670
msgid "Display all artwork supports"
671
msgstr "Voir tous les supports"
672

  
673
#: app/views/admin/artwork_supports/edit.rhtml:1
674
msgid "Modify Artwork Support"
675
msgstr "Modifier le support"
676

  
677
#: app/views/admin/artwork_placement_reasons/new.rhtml:1
678
msgid "New Artwork Placement Reason"
679
msgstr "Nouvelle Raison de Placement d'une Œuvre"
680

  
681
#: app/views/admin/artwork_placement_reasons/index.rhtml:1
682
msgid "List of Artwork Placement Reasons"
683
msgstr "Liste des Raisons de Placement d'une Œuvre"
684

  
685
#: app/views/admin/artwork_placement_reasons/show.rhtml:1
686
msgid "Artwork Placement Reason #%u"
687
msgstr "Raison de Placement d'une Œuvre n°%u"
688

  
593 689
#: app/views/admin/artwork_placement_reasons/show.rhtml:11
594 690
#: app/views/admin/artwork_materials/show.rhtml:11
595 691
msgid "Display all artwork materials"
......
615 711
msgid "Modify Artwork Material"
616 712
msgstr "Modifier le Matériau"
617 713

  
618
#: app/views/admin/techniques/new.rhtml:1
619
msgid "New Technique"
620
msgstr "Nouvelle Technique"
621

  
622
#: app/views/admin/techniques/index.rhtml:1
623
msgid "List of Techniques"
624
msgstr "Liste des Techniques"
625

  
626
#: app/views/admin/techniques/index.rhtml:5
627
msgid "Acronym"
628
msgstr "Acronyme"
629

  
630
#: app/views/admin/techniques/show.rhtml:1
631
msgid "Technique #%u"
632
msgstr "Technique n°%u"
633

  
634
#: app/views/admin/techniques/show.rhtml:7
635
#: app/views/admin/techniques/_form.rhtml:8
636
msgid "Acronym:"
637
msgstr "Acronyme :"
638

  
639
#: app/views/admin/techniques/show.rhtml:12
640
msgid "Display all techniques"
641
msgstr "Afficher toutes les techniques"
642

  
643
#: app/views/admin/techniques/edit.rhtml:1
644
msgid "Modify Technique"
645
msgstr "Modifier la Technique"
646

  
647 714
#: app/views/admin/artwork_conditions/new.rhtml:1
648 715
msgid "New Artwork Condition"
649 716
msgstr "Nouvel État d'une Œuvre"
......
798 865
msgstr "Matériau :"
799 866

  
800 867
#: app/views/admin/artworks/show.rhtml:30
801
msgid "Techniques:"
802
msgstr "Techniques :"
868
msgid "Supports:"
869
msgstr "Supports :"
803 870

  
804 871
#: app/views/admin/artworks/show.rhtml:32
805 872
#: app/views/admin/artworks/_form.rhtml:31
......
855 922
msgstr "Position dans l'Ensemble :"
856 923

  
857 924
#: app/views/admin/artworks/_form.rhtml:29
858
msgid "Techniques"
859
msgstr "techniques"
925
msgid "Supports"
926
msgstr "Supports"
860 927

  
861 928
#: app/views/admin/artworks/edit.rhtml:1
862 929
msgid "Modify Artwork"
......
885 952
#: app/views/admin/artwork_groups/edit.rhtml:1
886 953
msgid "Modify Artwork Group"
887 954
msgstr "Modifier l'Ensemble"
955

  

Also available in: Unified diff